[Bf-blender-cvs] [aa2dfe1b026] greasepencil-object: Rename grease pencil modifier callbacks
Antonio Vazquez
noreply at git.blender.org
Fri May 11 18:27:27 CEST 2018
Commit: aa2dfe1b0260b90db1954d36ffa8e9ce49f899cf
Author: Antonio Vazquez
Date: Fri May 11 18:27:00 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBaa2dfe1b0260b90db1954d36ffa8e9ce49f899cf
Rename grease pencil modifier callbacks
Add the prefix gp_
===================================================================
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/object/object_modifier.c
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_gpencilbuild.c
M source/blender/modifiers/intern/MOD_gpencilcolor.c
M source/blender/modifiers/intern/MOD_gpencilhook.c
M source/blender/modifiers/intern/MOD_gpencilinstance.c
M source/blender/modifiers/intern/MOD_gpencillattice.c
M source/blender/modifiers/intern/MOD_gpencilnoise.c
M source/blender/modifiers/intern/MOD_gpenciloffset.c
M source/blender/modifiers/intern/MOD_gpencilopacity.c
M source/blender/modifiers/intern/MOD_gpencilsimplify.c
M source/blender/modifiers/intern/MOD_gpencilsmooth.c
M source/blender/modifiers/intern/MOD_gpencilsubdiv.c
M source/blender/modifiers/intern/MOD_gpencilthick.c
M source/blender/modifiers/intern/MOD_gpenciltint.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 1ac72950b5d..43d738de0e4 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -35,7 +35,7 @@
struct ID;
struct Depsgraph;
struct DerivedMesh;
-struct bContext; /* NOTE: bakeModifierGP() - called from UI - needs to create new datablocks, hence the need for this */
+struct bContext; /* NOTE: gp_bakeModifier() - called from UI - needs to create new datablocks, hence the need for this */
struct Mesh;
struct Object;
struct Scene;
@@ -294,7 +294,7 @@ typedef struct ModifierTypeInfo {
* 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 (*deformStroke)(struct ModifierData *md, struct Depsgraph *depsgraph,
+ 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
@@ -308,7 +308,7 @@ typedef struct ModifierTypeInfo {
* The modifier_index parameter indicates where the modifier is
* in the modifier stack in relation to other modifiers.
*/
- void (*generateStrokes)(struct ModifierData *md, struct Depsgraph *depsgraph,
+ 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.
@@ -317,7 +317,7 @@ typedef struct ModifierTypeInfo {
* As such, this callback needs to go through all layers/frames in the
* datablock, mutating the geometry and/or creating new datablocks/objects
*/
- void (*bakeModifierGP)(const struct bContext *C, struct Depsgraph *depsgraph,
+ void (*gp_bakeModifier)(const struct bContext *C, struct Depsgraph *depsgraph,
struct ModifierData *md, struct Object *ob);
/********************* Optional functions *********************/
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 6c22bd9b533..ecab8096e91 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -345,7 +345,7 @@ bool BKE_gpencil_has_geometry_modifiers(Object *ob)
for (md = ob->modifiers.first; md; md = md->next) {
const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
- if (mti && mti->generateStrokes) {
+ if (mti && mti->gp_generateStrokes) {
return true;
}
}
@@ -369,8 +369,8 @@ void BKE_gpencil_stroke_modifiers(Depsgraph *depsgraph, Object *ob, bGPDlayer *g
continue;
}
- if (mti && mti->deformStroke) {
- mti->deformStroke(md, depsgraph, ob, gpl, gps);
+ if (mti && mti->gp_deformStroke) {
+ mti->gp_deformStroke(md, depsgraph, ob, gpl, gps);
}
}
}
@@ -393,8 +393,8 @@ void BKE_gpencil_geometry_modifiers(Depsgraph *depsgraph, Object *ob, bGPDlayer
continue;
}
- if (mti->generateStrokes) {
- mti->generateStrokes(md, depsgraph, ob, gpl, gpf);
+ if (mti->gp_generateStrokes) {
+ mti->gp_generateStrokes(md, depsgraph, ob, gpl, gpf);
}
}
}
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
index cba1b5ea963..2636cb0aa7c 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -1047,7 +1047,7 @@ struct GPUTexture *DRW_gpencil_create_blank_texture(int width, int height)
}
/* Helper for gpencil_instance_modifiers()
- * See also MOD_gpencilinstance.c -> bakeModifierGP()
+ * See also MOD_gpencilinstance.c -> gp_bakeModifier()
*/
static void gp_instance_modifier_make_instances(GPENCIL_StorageList *stl, Object *ob, InstanceGpencilModifierData *mmd)
{
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index e1c35534da3..2379015a585 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -1842,8 +1842,8 @@ 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, depsgraph, md, base->object);
+ if (mti->gp_bakeModifier) {
+ mti->gp_bakeModifier(C, depsgraph, md, base->object);
}
}
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 53b81a4a686..c3cea116207 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -660,12 +660,12 @@ static int modifier_apply_obdata(ReportList *reports, bContext *C, Depsgraph *de
if (ELEM(NULL, ob, ob->data)) {
return 0;
}
- else if (mti->bakeModifierGP == NULL) {
+ else if (mti->gp_bakeModifier == NULL) {
BKE_report(reports, RPT_ERROR, "Not implemented");
return 0;
}
- mti->bakeModifierGP(C, depsgraph, md, ob);
+ mti->gp_bakeModifier(C, depsgraph, md, ob);
DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
}
else {
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c
index 0c7e09956c6..e755779a87b 100644
--- a/source/blender/modifiers/intern/MOD_armature.c
+++ b/source/blender/modifiers/intern/MOD_armature.c
@@ -208,9 +208,9 @@ ModifierTypeInfo modifierType_Armature = {
/* applyModifier */ NULL,
/* applyModifierEM */ NULL,
- /* deformStroke */ NULL,
- /* generateStrokes */ NULL,
- /* bakeModifierGP */ NULL,
+ /* gp_deformStroke */ NULL,
+ /* gp_generateStrokes */ NULL,
+ /* gp_bakeModifier */ NULL,
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index 7d992db5986..132d9a55529 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -777,9 +777,9 @@ ModifierTypeInfo modifierType_Array = {
/* applyModifier */ applyModifier,
/* applyModifierEM */ NULL,
- /* deformStroke */ NULL,
- /* generateStrokes */ NULL,
- /* bakeModifierGP */ NULL,
+ /* gp_deformStroke */ NULL,
+ /* gp_generateStrokes */ NULL,
+ /* gp_bakeModifier */ NULL,
/* initData */ initData,
/* requiredDataMask */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index 623e270f191..204444c5bc3 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -210,9 +210,9 @@ ModifierTypeInfo modifierType_Bevel = {
/* applyModifier */ applyModifier,
/* applyModifierEM */ NULL,
- /* deformStroke */ NULL,
- /* generateStrokes */ NULL,
- /* bakeModifierGP */ NULL,
+ /* gp_deformStroke */ NULL,
+ /* gp_generateStrokes */ NULL,
+ /* gp_bakeModifier */ NULL,
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index ffd8368460c..13b67bd1adb 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -360,9 +360,9 @@ ModifierTypeInfo modifierType_Boolean = {
/* applyModifier */ applyModifier,
/* applyModifierEM */ NULL,
- /* deformStroke */ NULL,
- /* generateStrokes */ NULL,
- /* bakeModifierGP */ NULL,
+ /* gp_deformStroke */ NULL,
+ /* gp_generateStrokes */ NULL,
+ /* gp_bakeModifier */ NULL,
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c
index fd208f56002..a91ec6da27a 100644
--- a/source/blender/modifiers/intern/MOD_build.c
+++ b/source/blender/modifiers/intern/MOD_build.c
@@ -316,9 +316,9 @@ ModifierTypeInfo modifierType_Build = {
/* applyModifier */ applyModifier,
/* applyModifierEM */ NULL,
- /* deformStroke */ NULL,
- /* generateStrokes */ NULL,
- /* bakeModifierGP */ NULL,
+ /* gp_deformStroke */ NULL,
+ /* gp_generateStrokes */ NULL,
+ /* gp_bakeModifier */ NULL,
/* initData */ initData,
/* requiredDataMask */ NULL,
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c
index 11e840fe1ff..5b58a3ffa8a 100644
--- a/source/blender/modifiers/intern/MOD_cast.c
+++ b/source/blender/modifiers/intern/MOD_cast.c
@@ -492,9 +492,9 @@ ModifierTypeInfo modifierType_Cast = {
/* applyModifier */ NULL,
/* applyModifierEM */ NULL,
- /* deformStroke */ NULL,
- /* generateStrokes */ NULL,
- /* bakeModifierGP */ NULL,
+ /* gp_deformStroke */ NULL,
+ /* gp_generateStrokes */ NULL,
+ /* gp_bakeModifier */ NULL,
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c
index 7485b796dd2..722275390a6 100644
--- a/source/blender/modifiers/intern/MOD_cloth.c
+++ b/source/blender/modifiers/intern/MOD_cloth.c
@@ -241,9 +241,9 @@ ModifierTypeInfo modifierType_Cloth = {
/* applyModifier */ NULL,
/* applyModifierEM */ NULL,
- /* deformStroke */ NULL,
- /* generateStrokes */ NULL,
- /* bakeModifierGP */ NULL,
+ /* gp_deformStroke */ NULL,
+ /* gp_generateStrokes */ NULL,
+ /* gp_bakeModifier */ NULL,
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c
index 470af577ca1..9a04bdf35ed 100644
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list