Commit: bba60bb564cf5a16cfcac744d4ba82cf8eba3da9 Author: Campbell Barton Date: Mon Apr 22 09:16:44 2019 +1000 Branches: master https://developer.blender.org/rBbba60bb564cf5a16cfcac744d4ba82cf8eba3da9
Cleanup: style, use braces for gpencil modifiers =================================================================== M source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c M source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c M source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c M source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c M source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c M source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c =================================================================== diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c index aad8805c294..1ef1068ee52 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c @@ -126,8 +126,9 @@ static void bakeModifier(Main *bmain, Depsgraph *depsgraph, GpencilModifierData bGPdata *gpd = (bGPdata *)ob->data; int oldframe = (int)DEG_get_ctime(depsgraph); - if (mmd->object == NULL) + if (mmd->object == NULL) { return; + } for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) { for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) { diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c index ed2dfb0d15b..c1a49183a66 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c @@ -113,12 +113,14 @@ static void bakeModifier(Main *bmain, Depsgraph *depsgraph, GpencilModifierData for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) { Material *mat = give_current_material(ob, gps->mat_nr + 1); - if (mat == NULL) + if (mat == NULL) { continue; + } MaterialGPencilStyle *gp_style = mat->gp_style; /* skip stroke if it doesn't have color info */ - if (ELEM(NULL, gp_style)) + if (ELEM(NULL, gp_style)) { continue; + } copy_v4_v4(gps->runtime.tmp_stroke_rgba, gp_style->stroke_rgba); copy_v4_v4(gps->runtime.tmp_fill_rgba, gp_style->fill_rgba); diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c index 9876be951ae..daca46c3a9a 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c @@ -271,8 +271,9 @@ static void bakeModifier(Main *bmain, Depsgraph *depsgraph, GpencilModifierData bGPdata *gpd = ob->data; int oldframe = (int)DEG_get_ctime(depsgraph); - if (mmd->object == NULL) + if (mmd->object == NULL) { return; + } for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) { for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) { diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c index de0ecd5cda5..da2b4214da1 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c @@ -117,8 +117,9 @@ static void bakeModifier(Main *bmain, Depsgraph *depsgraph, GpencilModifierData bGPdata *gpd = ob->data; int oldframe = (int)DEG_get_ctime(depsgraph); - if (mmd->object == NULL) + if (mmd->object == NULL) { return; + } for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) { for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) { diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c index 0d01d1dc794..587cf527118 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c @@ -134,12 +134,14 @@ static void bakeModifier(Main *bmain, Depsgraph *depsgraph, GpencilModifierData for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) { Material *mat = give_current_material(ob, gps->mat_nr + 1); - if (mat == NULL) + if (mat == NULL) { continue; + } MaterialGPencilStyle *gp_style = mat->gp_style; /* skip stroke if it doesn't have color info */ - if (ELEM(NULL, gp_style)) + if (ELEM(NULL, gp_style)) { continue; + } copy_v4_v4(gps->runtime.tmp_stroke_rgba, gp_style->stroke_rgba); copy_v4_v4(gps->runtime.tmp_fill_rgba, gp_style->fill_rgba); diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c index e422c6d5598..289cae955ba 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c @@ -122,12 +122,14 @@ static void bakeModifier(Main *bmain, Depsgraph *depsgraph, GpencilModifierData for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) { Material *mat = give_current_material(ob, gps->mat_nr + 1); - if (mat == NULL) + if (mat == NULL) { continue; + } MaterialGPencilStyle *gp_style = mat->gp_style; /* skip stroke if it doesn't have color info */ - if (ELEM(NULL, gp_style)) + if (ELEM(NULL, gp_style)) { continue; + } copy_v4_v4(gps->runtime.tmp_stroke_rgba, gp_style->stroke_rgba); copy_v4_v4(gps->runtime.tmp_fill_rgba, gp_style->fill_rgba); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs