[Bf-blender-cvs] [bbb97b0e405] temp-greasepencil-object-stacksplit: Remove Greasepencil specific structs from regular Modifiers
Dalai Felinto
noreply at git.blender.org
Mon Jun 18 15:19:33 CEST 2018
Commit: bbb97b0e405a4d2c64b2cf7d47b196739dbdeabe
Author: Dalai Felinto
Date: Mon Jun 18 15:18:47 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rBbbb97b0e405a4d2c64b2cf7d47b196739dbdeabe
Remove Greasepencil specific structs from regular Modifiers
Note: This breaks building in gpencil_data.c and object_modifier.c.
On the other hand it helps showing the places that need to use the
new grease pencil modifier stack.
===================================================================
M source/blender/blenkernel/BKE_modifier.h
M source/blender/modifiers/intern/MOD_armature.c
M source/blender/modifiers/intern/MOD_array.c
M source/blender/modifiers/intern/MOD_bevel.c
M source/blender/modifiers/intern/MOD_boolean.c
M source/blender/modifiers/intern/MOD_build.c
M source/blender/modifiers/intern/MOD_cast.c
M source/blender/modifiers/intern/MOD_cloth.c
M source/blender/modifiers/intern/MOD_collision.c
M source/blender/modifiers/intern/MOD_correctivesmooth.c
M source/blender/modifiers/intern/MOD_curve.c
M source/blender/modifiers/intern/MOD_datatransfer.c
M source/blender/modifiers/intern/MOD_decimate.c
M source/blender/modifiers/intern/MOD_displace.c
M source/blender/modifiers/intern/MOD_dynamicpaint.c
M source/blender/modifiers/intern/MOD_edgesplit.c
M source/blender/modifiers/intern/MOD_explode.c
M source/blender/modifiers/intern/MOD_fluidsim.c
M source/blender/modifiers/intern/MOD_hook.c
M source/blender/modifiers/intern/MOD_laplaciandeform.c
M source/blender/modifiers/intern/MOD_laplaciansmooth.c
M source/blender/modifiers/intern/MOD_lattice.c
M source/blender/modifiers/intern/MOD_mask.c
M source/blender/modifiers/intern/MOD_meshcache.c
M source/blender/modifiers/intern/MOD_meshdeform.c
M source/blender/modifiers/intern/MOD_meshsequencecache.c
M source/blender/modifiers/intern/MOD_mirror.c
M source/blender/modifiers/intern/MOD_multires.c
M source/blender/modifiers/intern/MOD_none.c
M source/blender/modifiers/intern/MOD_normal_edit.c
M source/blender/modifiers/intern/MOD_ocean.c
M source/blender/modifiers/intern/MOD_particleinstance.c
M source/blender/modifiers/intern/MOD_particlesystem.c
M source/blender/modifiers/intern/MOD_remesh.c
M source/blender/modifiers/intern/MOD_screw.c
M source/blender/modifiers/intern/MOD_shapekey.c
M source/blender/modifiers/intern/MOD_shrinkwrap.c
M source/blender/modifiers/intern/MOD_simpledeform.c
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/modifiers/intern/MOD_smoke.c
M source/blender/modifiers/intern/MOD_smooth.c
M source/blender/modifiers/intern/MOD_softbody.c
M source/blender/modifiers/intern/MOD_solidify.c
M source/blender/modifiers/intern/MOD_subsurf.c
M source/blender/modifiers/intern/MOD_surface.c
M source/blender/modifiers/intern/MOD_surfacedeform.c
M source/blender/modifiers/intern/MOD_triangulate.c
M source/blender/modifiers/intern/MOD_uvproject.c
M source/blender/modifiers/intern/MOD_uvwarp.c
M source/blender/modifiers/intern/MOD_warp.c
M source/blender/modifiers/intern/MOD_wave.c
M source/blender/modifiers/intern/MOD_weightvgedit.c
M source/blender/modifiers/intern/MOD_weightvgmix.c
M source/blender/modifiers/intern/MOD_weightvgproximity.c
M source/blender/modifiers/intern/MOD_wireframe.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 28a88a7fe81..8a9e2f44604 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -35,7 +35,6 @@
struct ID;
struct Depsgraph;
struct DerivedMesh;
-struct bContext; /* NOTE: gp_bakeModifier() - called from UI - needs to create new datablocks, hence the need for this */
struct Mesh;
struct Object;
struct Scene;
@@ -46,9 +45,6 @@ struct Main;
struct ModifierData;
struct BMEditMesh;
struct DepsNodeHandle;
-struct bGPDlayer;
-struct bGPDframe;
-struct bGPDstroke;
typedef enum {
/* Should not be used, only for None modifier type */
@@ -277,45 +273,6 @@ typedef struct ModifierTypeInfo {
struct Mesh *mesh);
- /******************* GP modifier functions *********************/
-
- /* Callback for GP "stroke" modifiers that operate on the
- * shape and parameters of the provided strokes (e.g. Thickness, Noise, etc.)
- *
- * The gpl parameter contains the GP layer that the strokes come from.
- * While access is provided to this data, you should not directly access
- * the gpl->frames data from the modifier. Instead, use the gpf parameter
- * instead.
- *
- * The gps parameter contains the GP stroke to operate on. This is usually a copy
- * of the original (unmodified and saved to files) stroke data.
- */
- void (*gp_deformStroke)(struct ModifierData *md, struct Depsgraph *depsgraph,
- struct Object *ob, struct bGPDlayer *gpl, struct bGPDstroke *gps);
-
- /* Callback for GP "geometry" modifiers that create extra geometry
- * in the frame (e.g. Array)
- *
- * The gpf parameter contains the GP frame/strokes to operate on. This is
- * usually a copy of the original (unmodified and saved to files) stroke data.
- * Modifiers should only add any generated strokes to this frame (and not one accessed
- * via the gpl parameter).
- *
- * The modifier_index parameter indicates where the modifier is
- * in the modifier stack in relation to other modifiers.
- */
- void (*gp_generateStrokes)(struct ModifierData *md, struct Depsgraph *depsgraph,
- struct Object *ob, struct bGPDlayer *gpl, struct bGPDframe *gpf);
-
- /* Bake-down GP modifier's effects into the GP datablock.
- *
- * This gets called when the user clicks the "Apply" button in the UI.
- * As such, this callback needs to go through all layers/frames in the
- * datablock, mutating the geometry and/or creating new datablocks/objects
- */
- void (*gp_bakeModifier)(struct Main *bmain, struct Depsgraph *depsgraph,
- struct ModifierData *md, struct Object *ob);
-
/********************* Optional functions *********************/
/* Initialize new instance data for this modifier type, this function
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c
index 9c9a70b8aca..40d568537a0 100644
--- a/source/blender/modifiers/intern/MOD_armature.c
+++ b/source/blender/modifiers/intern/MOD_armature.c
@@ -210,10 +210,6 @@ ModifierTypeInfo modifierType_Armature = {
/* applyModifier */ NULL,
/* applyModifierEM */ NULL,
- /* gp_deformStroke */ NULL,
- /* gp_generateStrokes */ NULL,
- /* gp_bakeModifier */ NULL,
-
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
/* freeData */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index fa50a62d31d..c1268157d58 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -786,10 +786,6 @@ ModifierTypeInfo modifierType_Array = {
/* applyModifier */ applyModifier,
/* applyModifierEM */ NULL,
- /* gp_deformStroke */ NULL,
- /* gp_generateStrokes */ NULL,
- /* gp_bakeModifier */ NULL,
-
/* initData */ initData,
/* requiredDataMask */ NULL,
/* freeData */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index a18a3a7c141..74cbbb65e80 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -210,10 +210,6 @@ ModifierTypeInfo modifierType_Bevel = {
/* applyModifier */ applyModifier,
/* applyModifierEM */ NULL,
- /* gp_deformStroke */ NULL,
- /* gp_generateStrokes */ NULL,
- /* gp_bakeModifier */ NULL,
-
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
/* freeData */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index 237460d5d6c..f7b16431c48 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -374,10 +374,6 @@ ModifierTypeInfo modifierType_Boolean = {
/* applyModifier */ applyModifier,
/* applyModifierEM */ NULL,
- /* gp_deformStroke */ NULL,
- /* gp_generateStrokes */ NULL,
- /* gp_bakeModifier */ NULL,
-
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
/* freeData */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c
index 6e5c93c751a..9b491d4333f 100644
--- a/source/blender/modifiers/intern/MOD_build.c
+++ b/source/blender/modifiers/intern/MOD_build.c
@@ -317,10 +317,6 @@ ModifierTypeInfo modifierType_Build = {
/* applyModifier */ applyModifier,
/* applyModifierEM */ NULL,
- /* gp_deformStroke */ NULL,
- /* gp_generateStrokes */ NULL,
- /* gp_bakeModifier */ NULL,
-
/* initData */ initData,
/* requiredDataMask */ NULL,
/* freeData */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c
index 7ff5e1482c5..4441af57c93 100644
--- a/source/blender/modifiers/intern/MOD_cast.c
+++ b/source/blender/modifiers/intern/MOD_cast.c
@@ -493,10 +493,6 @@ ModifierTypeInfo modifierType_Cast = {
/* applyModifier */ NULL,
/* applyModifierEM */ NULL,
- /* gp_deformStroke */ NULL,
- /* gp_generateStrokes */ NULL,
- /* gp_bakeModifier */ NULL,
-
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
/* freeData */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c
index 4217a0a731b..19afe30acae 100644
--- a/source/blender/modifiers/intern/MOD_cloth.c
+++ b/source/blender/modifiers/intern/MOD_cloth.c
@@ -255,10 +255,6 @@ ModifierTypeInfo modifierType_Cloth = {
/* applyModifier */ NULL,
/* applyModifierEM */ NULL,
- /* gp_deformStroke */ NULL,
- /* gp_generateStrokes */ NULL,
- /* gp_bakeModifier */ NULL,
-
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
/* freeData */ freeData,
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c
index 3a06d4b81e9..7f02bbf0453 100644
--- a/source/blender/modifiers/intern/MOD_collision.c
+++ b/source/blender/modifiers/intern/MOD_collision.c
@@ -285,10 +285,6 @@ ModifierTypeInfo modifierType_Collision = {
/* applyModifier */ NULL,
/* applyModifierEM */ NULL,
- /* gp_deformStroke */ NULL,
- /* gp_generateStrokes */ NULL,
- /* gp_bakeModifier */ NULL,
-
/* initData */ initData,
/* requiredDataMask */ NULL,
/* freeData */ freeData,
diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c
index 72a82d243c6..df5cd956000 100644
--- a/source/blender/modifiers/intern/MOD_correctivesmooth.c
+++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c
@@ -765,10 +765,6 @@ ModifierTypeInfo modifierType_CorrectiveSmooth = {
/* applyModifier */ NULL,
/* applyModifierEM */ NULL,
- /* gp_deformStroke */ NULL,
- /* gp_generateStrokes */ NULL,
- /* gp_bakeModifier */ NULL,
-
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
/* freeData */ freeData,
diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c
index 97ca704b341..deda8213a65 100644
--- a/source/blender/modifiers/intern/MOD_curve.c
+++ b/source/blender/modifiers/intern/MOD_curve.c
@@ -171,10 +171,6 @@ ModifierTypeInfo modifierType_Curve = {
/* applyModifier */ NULL,
/* applyModifierEM */ NULL,
- /* gp_deformStroke */ NULL,
- /* gp_generateStrokes */ NULL,
- /* gp_bakeModifier */ NULL,
-
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
/* freeData */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c
index 7cd9625d9ac..21d1a6a865d 100644
--- a/source/blender/modifiers/intern/MOD_datatransfer.c
+++ b/source/blender/modifiers/intern/MOD_datatransfer.c
@@ -227,10 +227,6 @@ ModifierTypeInfo modifierType_DataTransfer = {
/* applyModifier */ NULL,
/* applyModifierEM */ NULL,
- /* gp_deformStroke */ NULL,
- /* gp_generateStrokes */ NULL,
- /* gp_bakeModifier */ NULL,
-
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
/* freeData */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index 3a62dcdd476..89ed8d627f1 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -229,10 +229,6 @@ ModifierTypeInfo modifierType_Decimate = {
/* applyModifier */ applyModifier,
/* applyModifierEM */ NULL,
- /* gp_deformStroke */ NULL,
- /* gp_generateStrokes */ NULL,
- /* gp_bakeModifier */ NULL,
-
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
/* freeData */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index e858de48752..ef15b5fbf7a 100644
--- a/sour
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list