[Bf-blender-cvs] [43adb12a1ce] greasepencil-object: Cleanup: comments and reorganize

[Antonio Vazquez]

Commit: 43adb12a1ce9ea2df5406c9c8f8d61b4428db5ec
Author: Antonio Vazquez
Date:   Thu Dec 21 18:08:55 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB43adb12a1ce9ea2df5406c9c8f8d61b4428db5ec

Cleanup:  comments and reorganize

===================================================================

M       source/blender/editors/gpencil/gpencil_data.c

===================================================================

diff --git a/source/blender/editors/gpencil/gpencil_data.c 
b/source/blender/editors/gpencil/gpencil_data.c
index 182d4ab4c1a..c03914f4505 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -1893,6 +1893,11 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator 
*op)
        if (!obact || obact->type != OB_GPENCIL)
                return OPERATOR_CANCELLED;
 
+       bGPdata *gpd = (bGPdata *)obact->data;
+       if ((!gpd) || GPENCIL_ANY_MODE(gpd)) {
+               return OPERATOR_CANCELLED;
+       }
+
        /* Ensure all rotations are applied before */
        CTX_DATA_BEGIN(C, Base *, base, selected_editable_bases)
        {
@@ -1908,11 +1913,6 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator 
*op)
        }
        CTX_DATA_END;
 
-       bGPdata *gpd = (bGPdata *)obact->data;
-       if ((!gpd) || GPENCIL_ANY_MODE(gpd)) {
-               return OPERATOR_CANCELLED;
-       }
-
        CTX_DATA_BEGIN(C, Base *, base, selected_editable_bases)
        {
                if (base->object == obact) {
@@ -1930,7 +1930,7 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator 
*op)
 
        gpd_act = obact->data;
 
-       /* loop and join */
+       /* loop and join all data */
        CTX_DATA_BEGIN(C, Base *, base, selected_editable_bases)
        {
                if ((base->object->type == OB_GPENCIL) && (base->object != 
obact)) {
@@ -1941,7 +1941,6 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator 
*op)
                                /* Apply all GP modifiers before */
                                for (ModifierData *md = 
base->object->modifiers.first; md; md = md->next) {
                                        const ModifierTypeInfo *mti = 
modifierType_getInfo(md->type);
-
                                        if (mti->bakeModifierGP) {
                                                mti->bakeModifierGP(C, 
bmain->eval_ctx, md, base->object);
                                        }
@@ -1979,7 +1978,7 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator 
*op)
                                        }
                                }
 
-                               /* duplicate layers */
+                               /* duplicate bGPDlayers  */
                                float imat[3][3], bmat[3][3];
                                float offset_global[3];
                                float offset_local[3];
@@ -2010,9 +2009,9 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator 
*op)
                                                        }
                                                }
                                        }
-
-                                       /* add to datablock */
+                                       /* be sure name is unique */
                                        BLI_uniquename(&gpd_act->layers, 
gpl_new, DATA_("GP_Layer"), '.', offsetof(bGPDlayer, info), 
sizeof(gpl_new->info));
+                                       /* add to datablock */
                                        BLI_addtail(&gpd_act->layers, gpl_new);
                                }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs