diff options
5 files changed, 7 insertions, 8 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 45af80c0a62..32744cb4262 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -1786,7 +1786,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): row = layout.row() row.prop(md, "create_materials") row.prop(md, "modify_color") - + def GP_COLOR(self, layout, ob, md): gpd = ob.data @@ -1833,7 +1833,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): row = col.row(align=True) row.prop(md, "pass_index", text="Pass") row.prop(md, "invert_pass", text="", icon="ARROW_LEFTRIGHT") - + row = layout.row() row.prop(md, "create_materials") row.prop(md, "modify_color") diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c index 7d66d25c58a..6e555ac1f96 100644 --- a/source/blender/blenkernel/intern/editmesh.c +++ b/source/blender/blenkernel/intern/editmesh.c @@ -251,9 +251,9 @@ void BKE_editmesh_lnorspace_update(BMEditMesh *em) { BMesh *bm = em->bm; - /* We need to create clnors data if none exist yet, otherwise there is no way to edit them. + /* We need to create clnors data if none exist yet, otherwise there is no way to edit them. * Similar code to MESH_OT_customdata_custom_splitnormals_add operator, we want to keep same shading - * in case we were using autosmooth so far... + * in case we were using autosmooth so far... * Note: there is a problem here, which is that if someone starts a normal editing operation on previously * autosmooth-ed mesh, and cancel that operation, generated clnors data remain, with related sharp edges * (and hence autosmooth is 'lost'). diff --git a/source/blender/blenkernel/intern/subdiv_displacement_multires.c b/source/blender/blenkernel/intern/subdiv_displacement_multires.c index ce42fa16438..8f0048a3ed4 100644 --- a/source/blender/blenkernel/intern/subdiv_displacement_multires.c +++ b/source/blender/blenkernel/intern/subdiv_displacement_multires.c @@ -388,7 +388,7 @@ static void displacement_data_init_mapping(SubdivDisplacement *displacement, ptex_poly_corner[ptex_face_index].poly_index = poly_index; ptex_poly_corner[ptex_face_index].corner = 0; ptex_face_index++; - } + } else { for (int corner = 0; corner < poly->totloop; corner++) { ptex_poly_corner[ptex_face_index].poly_index = poly_index; diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 2e2e52058b5..0a906ce5eb6 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -10980,4 +10980,3 @@ static void read_libraries(FileData *basefd, ListBase *mainlist) } BKE_main_free(main_newid); } - diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index 59336561456..90543c47c1b 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -563,7 +563,7 @@ void GPENCIL_cache_populate(void *vedata, Object *ob) if ((draw_ctx->obact != ob) && GPENCIL_ANY_EDIT_MODE(gpd)) { return; } - + if ((stl->g_data->session_flag & GP_DRW_PAINT_READY) == 0) { /* save gp objects for drawing later */ @@ -740,7 +740,7 @@ void GPENCIL_draw_scene(void *ved) } /* Current buffer drawing */ - if ((!is_render) && (cache_ob->is_dup_ob == false)) + if ((!is_render) && (cache_ob->is_dup_ob == false)) { DRW_draw_pass(psl->drawing_pass); } |