[Bf-blender-cvs] [60fb91d7958] temp-greasepencil-object-stacksplit: Fix old modifier listbase field name

[Antonio Vazquez]

Commit: 60fb91d7958a01ddb4822cad724b700f7c42e00c
Author: Antonio Vazquez
Date:   Tue Jun 19 10:14:36 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rB60fb91d7958a01ddb4822cad724b700f7c42e00c

Fix old modifier listbase field name

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

M       source/blender/blenkernel/intern/gpencil_modifier.c

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

diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c 
b/source/blender/blenkernel/intern/gpencil_modifier.c
index 2716a754d63..d2d9b20a31f 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -325,7 +325,7 @@ void BKE_gpencil_simplify_fixed(bGPDstroke *gps)
 void BKE_gpencil_lattice_init(Object *ob)
 {
        GreasePencilModifierData *md;
-       for (md = ob->modifiers.first; md; md = md->next) {
+       for (md = ob->greasepencil_modifiers.first; md; md = md->next) {
                if (md->type == eGreasePencilModifierType_Lattice) {
                        LatticeGreasePencilModifierData *mmd = 
(LatticeGreasePencilModifierData *)md;
                        Object *latob = NULL;
@@ -348,7 +348,7 @@ void BKE_gpencil_lattice_init(Object *ob)
 void BKE_gpencil_lattice_clear(Object *ob)
 {
        GreasePencilModifierData *md;
-       for (md = ob->modifiers.first; md; md = md->next) {
+       for (md = ob->greasepencil_modifiers.first; md; md = md->next) {
                if (md->type == eGreasePencilModifierType_Lattice) {
                        LatticeGreasePencilModifierData *mmd = 
(LatticeGreasePencilModifierData *)md;
                        if ((mmd) && (mmd->cache_data)) {
@@ -366,7 +366,7 @@ void BKE_gpencil_lattice_clear(Object *ob)
 bool BKE_gpencil_has_geometry_modifiers(Object *ob)
 {
        GreasePencilModifierData *md;
-       for (md = ob->modifiers.first; md; md = md->next) {
+       for (md = ob->greasepencil_modifiers.first; md; md = md->next) {
                const GreasePencilModifierTypeInfo *mti = 
BKE_gpencil_modifierType_getInfo(md->type);
                
                if (mti && mti->gp_generateStrokes) {
@@ -383,7 +383,7 @@ void BKE_gpencil_stroke_modifiers(Depsgraph *depsgraph, 
Object *ob, bGPDlayer *g
        bGPdata *gpd = ob->data;
        const bool is_edit = GPENCIL_ANY_EDIT_MODE(gpd);
 
-       for (md = ob->modifiers.first; md; md = md->next) {
+       for (md = ob->greasepencil_modifiers.first; md; md = md->next) {
                if (GPENCIL_MODIFIER_ACTIVE(md, is_render))
                {
                        const GreasePencilModifierTypeInfo *mti = 
BKE_gpencil_modifierType_getInfo(md->type);
@@ -406,7 +406,7 @@ void BKE_gpencil_geometry_modifiers(Depsgraph *depsgraph, 
Object *ob, bGPDlayer
        bGPdata *gpd = ob->data;
        const bool is_edit = GPENCIL_ANY_EDIT_MODE(gpd);
 
-       for (md = ob->modifiers.first; md; md = md->next) {
+       for (md = ob->greasepencil_modifiers.first; md; md = md->next) {
                if (GPENCIL_MODIFIER_ACTIVE(md, is_render))
                {
                        const GreasePencilModifierTypeInfo *mti = 
BKE_gpencil_modifierType_getInfo(md->type);

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