[Bf-blender-cvs] [39c9d9035f0] greasepencil-object: Rename greasepencil callbacks since we are already in GP namespace
Dalai Felinto
noreply at git.blender.org
Wed Jun 20 18:41:09 CEST 2018
Commit: 39c9d9035f0f9139152b60609ae82b0dbff606f2
Author: Dalai Felinto
Date: Wed Jun 20 18:40:18 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB39c9d9035f0f9139152b60609ae82b0dbff606f2
Rename greasepencil callbacks since we are already in GP namespace
===================================================================
M source/blender/blenkernel/BKE_gpencil_modifier.h
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/draw/engines/gpencil/gpencil_draw_utils.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/object/object_gpencil_modifier.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
M source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h
index 540bb57c004..0013b35901a 100644
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@@ -33,7 +33,7 @@
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 bContext; /* NOTE: bakeModifier() - called from UI - needs to create new datablocks, hence the need for this */
struct Mesh;
struct Object;
struct Scene;
@@ -124,7 +124,7 @@ typedef struct GpencilModifierTypeInfo {
* 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 GpencilModifierData *md, struct Depsgraph *depsgraph,
+ void (*deformStroke)(struct GpencilModifierData *md, struct Depsgraph *depsgraph,
struct Object *ob, struct bGPDlayer *gpl, struct bGPDstroke *gps);
/* Callback for GP "geometry" modifiers that create extra geometry
@@ -138,7 +138,7 @@ typedef struct GpencilModifierTypeInfo {
* The modifier_index parameter indicates where the modifier is
* in the modifier stack in relation to other modifiers.
*/
- void (*gp_generateStrokes)(struct GpencilModifierData *md, struct Depsgraph *depsgraph,
+ void (*generateStrokes)(struct GpencilModifierData *md, struct Depsgraph *depsgraph,
struct Object *ob, struct bGPDlayer *gpl, struct bGPDframe *gpf);
/* Bake-down GP modifier's effects into the GP datablock.
@@ -147,7 +147,7 @@ typedef struct GpencilModifierTypeInfo {
* 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,
+ void (*bakeModifier)(struct Main *bmain, struct Depsgraph *depsgraph,
struct GpencilModifierData *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 957a56f7260..a0ad7067ccf 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -369,7 +369,7 @@ bool BKE_gpencil_has_geometry_modifiers(Object *ob)
for (md = ob->greasepencil_modifiers.first; md; md = md->next) {
const GpencilModifierTypeInfo *mti = BKE_gpencil_modifierType_getInfo(md->type);
- if (mti && mti->gp_generateStrokes) {
+ if (mti && mti->generateStrokes) {
return true;
}
}
@@ -392,8 +392,8 @@ void BKE_gpencil_stroke_modifiers(Depsgraph *depsgraph, Object *ob, bGPDlayer *g
continue;
}
- if (mti && mti->gp_deformStroke) {
- mti->gp_deformStroke(md, depsgraph, ob, gpl, gps);
+ if (mti && mti->deformStroke) {
+ mti->deformStroke(md, depsgraph, ob, gpl, gps);
}
}
}
@@ -415,8 +415,8 @@ void BKE_gpencil_geometry_modifiers(Depsgraph *depsgraph, Object *ob, bGPDlayer
continue;
}
- if (mti->gp_generateStrokes) {
- mti->gp_generateStrokes(md, depsgraph, ob, gpl, gpf);
+ if (mti->generateStrokes) {
+ mti->generateStrokes(md, depsgraph, ob, gpl, gpf);
}
}
}
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 9c5e7b322b3..2cf9c1a95ab 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -1237,7 +1237,7 @@ void DRW_gpencil_populate_datablock(GPENCIL_e_data *e_data, void *vedata, Scene
}
/* Helper for gpencil_instance_modifiers()
- * See also MOD_gpencilinstance.c -> gp_bakeModifier()
+ * See also MOD_gpencilinstance.c -> 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 6b0058652c9..f7e7184d519 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -1805,8 +1805,8 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator *op)
/* Apply all GP modifiers before */
for (GpencilModifierData *md = base->object->greasepencil_modifiers.first; md; md = md->next) {
const GpencilModifierTypeInfo *mti = BKE_gpencil_modifierType_getInfo(md->type);
- if (mti->gp_bakeModifier) {
- mti->gp_bakeModifier(bmain, depsgraph, md, base->object);
+ if (mti->bakeModifier) {
+ mti->bakeModifier(bmain, depsgraph, md, base->object);
}
}
diff --git a/source/blender/editors/object/object_gpencil_modifier.c b/source/blender/editors/object/object_gpencil_modifier.c
index 89b90c9a77f..da4ee5c3c98 100644
--- a/source/blender/editors/object/object_gpencil_modifier.c
+++ b/source/blender/editors/object/object_gpencil_modifier.c
@@ -216,11 +216,11 @@ static int gpencil_modifier_apply_obdata(ReportList *reports, Main *bmain, Depsg
if (ELEM(NULL, ob, ob->data)) {
return 0;
}
- else if (mti->gp_bakeModifier == NULL) {
+ else if (mti->bakeModifier == NULL) {
BKE_report(reports, RPT_ERROR, "Not implemented");
return 0;
}
- mti->gp_bakeModifier(bmain, depsgraph, md, ob);
+ mti->bakeModifier(bmain, depsgraph, md, ob);
DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
}
else {
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
index 94ae418d521..cbd9d699260 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
@@ -402,7 +402,7 @@ static void build_concurrent(BuildGpencilModifierData *mmd, bGPDframe *gpf, floa
/* --------------------------------------------- */
/* Entry-point for Build Modifier */
-static void gp_generateStrokes(
+static void generateStrokes(
GpencilModifierData *md, Depsgraph *depsgraph,
Object *UNUSED(ob), bGPDlayer *gpl, bGPDframe *gpf)
{
@@ -518,7 +518,7 @@ static void gp_generateStrokes(
* which would in turn break how the modifier functions.
*/
#if 0
-static void gp_bakeModifier(
+static void bakeModifier(
Main *bmain, const Depsgraph *UNUSED(depsgraph),
GpencilModifierData *md, Object *ob)
{
@@ -543,9 +543,9 @@ GpencilModifierTypeInfo modifierType_Gpencil_Build = {
/* copyData */ copyData,
- /* gp_deformStroke */ NULL,
- /* gp_generateStrokes */ gp_generateStrokes,
- /* gp_bakeModifier */ NULL,
+ /* deformStroke */ NULL,
+ /* generateStrokes */ generateStrokes,
+ /* bakeModifier */ NULL,
/* initData */ initData,
/* freeData */ NULL,
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
index 76f5f698b93..af00b24715f 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
@@ -68,7 +68,7 @@ static void copyData(const GpencilModifierData *md, GpencilModifierData *target)
}
/* color correction strokes */
-static void gp_deformStroke(
+static void deformStroke(
GpencilModifierData *md, Depsgraph *UNUSED(depsgraph),
Object *ob, bGPDlayer *gpl, bGPDstroke *gps)
{
@@ -97,7 +97,7 @@ static void gp_deformStroke(
hsv_to_rgb_v(hsv, gps->runtime.tmp_fill_rgba);
}
-static void gp_bakeModifier(
+static void bakeModifier(
Main *bmain, Depsgraph *depsgraph,
GpencilModifierData *md, Object *ob)
{
@@ -143,7 +143,7 @@ static void gp_bakeModifier(
copy_v4_v4(gp_style->fill_rgba, gps->runtime.tmp_fill_rgba);
}
- gp_deformStroke(md, depsgraph, ob, gpl, gps);
+ deformStroke(md, depsgraph, ob, gpl, gps);
}
}
}
@@ -163,9 +163,9 @@ GpencilModifierTypeInfo modifierType_Gpencil_Color = {
/* copyData */ copyData,
- /* gp_deformStroke */ gp_deformStroke,
- /* gp_generateStrokes */ NULL,
- /* gp_bakeModifier */ gp_bakeModifier,
+ /* deformStroke */ deformStroke,
+ /* generateStrokes */ NULL,
+ /* bakeModifier */ bakeModifier,
/* initData */ initData,
/* freeData */ NULL,
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
index 9d4e3aba8b3..e036b6b78be 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
@@ -194,7 +194,7 @@ static void gp_hook_co_apply(struct GPHookData_cb *tData, float weight, bGPDspoi
}
/* deform stroke */
-static void gp_deformStroke(
+static void deformStroke(
GpencilModifierData *md, Depsgraph *UNUSED(depsgraph),
Object *ob, bGPDlayer *gpl, bGPDstroke *gps)
{
@@ -264,7 +264,7 @@ static void gp_deformStroke(
/* FIXME: Ideally we be doing this on a copy of the main depsgraph
* (i.e. one where we don't have to worry about restoring state)
*/
-static void gp_bakeModifier(
+static void bakeModifier(
Main *bmain, Depsgraph *depsgraph,
GpencilModifierData *md, Object *ob)
{
@@ -286,7 +286,7 @@ static void gp_bakeModifier(
/* compute hook effects on this frame */
for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
- gp_deformStroke(md, depsgraph, ob, gpl, gps);
+ deformStroke(md, depsgraph, ob, gpl, gps);
}
}
}
@@ -340,9 +340,9 @@ GpencilModifierTypeInfo modifierType_Gpencil_Hook = {
/* copyData */ copyData,
- /* gp_deformStroke */ gp_deformStroke,
- /* gp_generateStrokes */ NULL,
- /* gp_bakeModifier */ gp_bakeModifier,
+ /* deformStroke */ deformStroke,
+ /* generateStrokes */ NULL,
+ /* bakeModifier */ bakeModifier,
/* initData */ initData,
/* freeData */ freeData,
diff --git a/source/blender/gpencil_modifiers
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list