Commit: c02ec744057737f056a61a445cc8d34b94ddb389 Author: Chris Blackbourn Date: Mon Nov 28 13:13:54 2022 +1300 Branches: master https://developer.blender.org/rBc02ec744057737f056a61a445cc8d34b94ddb389
Cleanup: format =================================================================== M source/blender/editors/gpencil/gpencil_select.c M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc =================================================================== diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c index 0156b272a81..0b11d6bf2ba 100644 --- a/source/blender/editors/gpencil/gpencil_select.c +++ b/source/blender/editors/gpencil/gpencil_select.c @@ -2442,11 +2442,11 @@ static int gpencil_select_exec(bContext *C, wmOperator *op) /* if select mode is stroke, use whole stroke */ if ((ob) && (ob->mode == OB_MODE_SCULPT_GPENCIL)) { whole |= (bool)(gpencil_select_mode_from_sculpt(ts->gpencil_selectmode_sculpt) == - GP_SELECTMODE_STROKE); + GP_SELECTMODE_STROKE); } else if ((ob) && (ob->mode == OB_MODE_VERTEX_GPENCIL)) { whole |= (bool)(gpencil_select_mode_from_vertex(ts->gpencil_selectmode_sculpt) == - GP_SELECTMODE_STROKE); + GP_SELECTMODE_STROKE); } else { whole |= (bool)(ts->gpencil_selectmode_edit == GP_SELECTMODE_STROKE); diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc index 2f30f030297..1fa2f2fbb03 100644 --- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc +++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc @@ -3542,7 +3542,8 @@ static LineartData *lineart_create_render_buffer(Scene *scene, copy_v3db_v3fl(ld->conf.active_camera_pos, active_camera->object_to_world[3]); } copy_m4_m4(ld->conf.cam_obmat, camera->object_to_world); - /* Make sure none of the scaling factor makes in, line art expects no scaling on cameras and lights. */ + /* Make sure none of the scaling factor makes in, line art expects no scaling on cameras and + * lights. */ normalize_v3(ld->conf.cam_obmat[0]); normalize_v3(ld->conf.cam_obmat[1]); normalize_v3(ld->conf.cam_obmat[2]); @@ -3574,7 +3575,8 @@ static LineartData *lineart_create_render_buffer(Scene *scene, Object *light_obj = lmd->light_contour_object; copy_v3db_v3fl(ld->conf.camera_pos_secondary, light_obj->object_to_world[3]); copy_m4_m4(ld->conf.cam_obmat_secondary, light_obj->object_to_world); - /* Make sure none of the scaling factor makes in, line art expects no scaling on cameras and lights. */ + /* Make sure none of the scaling factor makes in, line art expects no scaling on cameras and + * lights. */ normalize_v3(ld->conf.cam_obmat_secondary[0]); normalize_v3(ld->conf.cam_obmat_secondary[1]); normalize_v3(ld->conf.cam_obmat_secondary[2]); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs