[Bf-blender-cvs] [cbe0626e8ec] greasepencil-object: Cleanup: Remove a bunch of redundant/bad old code

[Joshua Leung]

Commit: cbe0626e8ecf518df2fa85efffcf99e5fd9cb189
Author: Joshua Leung
Date:   Fri Nov 3 23:58:57 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rBcbe0626e8ecf518df2fa85efffcf99e5fd9cb189

Cleanup: Remove a bunch of redundant/bad old code

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

M       source/blender/blenkernel/BKE_gpencil.h
M       source/blender/makesdna/DNA_modifier_types.h
M       source/blender/modifiers/intern/MOD_gpencillattice.c

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

diff --git a/source/blender/blenkernel/BKE_gpencil.h 
b/source/blender/blenkernel/BKE_gpencil.h
index dd48baec407..1d0da120ccb 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -47,15 +47,8 @@ struct PaletteColor;
 struct BoundBox;
 struct Object;
 struct bDeformGroup;
-struct GpencilNoiseModifierData;
-struct GpencilSubdivModifierData;
 struct GpencilSimplifyModifierData;
-struct GpencilThickModifierData;
-struct GpencilTintModifierData;
-struct GpencilColorModifierData;
 struct GpencilArrayModifierData;
-struct GpencilDupliModifierData;
-struct GpencilOpacityModifierData;
 struct GpencilLatticeModifierData;
 
 /* ------------ Grease-Pencil API ------------------ */
diff --git a/source/blender/makesdna/DNA_modifier_types.h 
b/source/blender/makesdna/DNA_modifier_types.h
index 8308964c514..d8bd9aa4ccc 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1798,7 +1798,6 @@ typedef struct GpencilLatticeModifierData {
        float strength;
        char pad[4];
        void *cache_data; /* runtime only (LatticeDeformData) */
-       void *C;                     /* bContext used only for apply */
 } GpencilLatticeModifierData;
 
 typedef enum eGpencilLattice_Flag {
diff --git a/source/blender/modifiers/intern/MOD_gpencillattice.c 
b/source/blender/modifiers/intern/MOD_gpencillattice.c
index ff0f090f38d..f1a683def73 100644
--- a/source/blender/modifiers/intern/MOD_gpencillattice.c
+++ b/source/blender/modifiers/intern/MOD_gpencillattice.c
@@ -72,7 +72,7 @@ static void bakeModifierGP(const bContext *C, const 
EvaluationContext *eval_ctx,
        GpencilLatticeModifierData *mmd = (GpencilLatticeModifierData *)md;
        LatticeDeformData *ldata = NULL;
        Scene *scene = md->scene;
-       Main *bmain = CTX_data_main(mmd->C);
+       Main *bmain = CTX_data_main(C);
        bGPdata *gpd = ob->data;
        Object *latob = mmd->object;
        int oldframe = CFRA;

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