[Bf-blender-cvs] [43993d7a55c] greasepencil-object: Rename eModifierType_Gpencil<ModName> to eModifierType_GPencil_<ModName>
Antonio Vazquez
noreply at git.blender.org
Thu May 10 17:52:58 CEST 2018
Commit: 43993d7a55c85088e5c76e4ad6b82345b02c86c1
Author: Antonio Vazquez
Date: Thu May 10 17:00:43 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB43993d7a55c85088e5c76e4ad6b82345b02c86c1
Rename eModifierType_Gpencil<ModName> to eModifierType_GPencil_<ModName>
===================================================================
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/writefile.c
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/MOD_modifiertypes.h
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_util.c
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 5e1eb9d16d6..f5c6910970b 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -302,7 +302,7 @@ void BKE_gpencil_lattice_init(Object *ob)
{
ModifierData *md;
for (md = ob->modifiers.first; md; md = md->next) {
- if (md->type == eModifierType_GpencilLattice) {
+ if (md->type == eModifierType_Gpencil_Lattice) {
GpencilLatticeModifierData *mmd = (GpencilLatticeModifierData *)md;
Object *latob = NULL;
@@ -325,7 +325,7 @@ void BKE_gpencil_lattice_clear(Object *ob)
{
ModifierData *md;
for (md = ob->modifiers.first; md; md = md->next) {
- if (md->type == eModifierType_GpencilLattice) {
+ if (md->type == eModifierType_Gpencil_Lattice) {
GpencilLatticeModifierData *mmd = (GpencilLatticeModifierData *)md;
if ((mmd) && (mmd->cache_data)) {
end_latt_deform((LatticeDeformData *)mmd->cache_data);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index ecb59770fa1..eddacd5ffd5 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5367,11 +5367,11 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
}
}
}
- else if (md->type == eModifierType_GpencilLattice) {
+ else if (md->type == eModifierType_Gpencil_Lattice) {
GpencilLatticeModifierData *gpmd = (GpencilLatticeModifierData*)md;
gpmd->cache_data = NULL;
}
- else if (md->type == eModifierType_GpencilHook) {
+ else if (md->type == eModifierType_Gpencil_Hook) {
GpencilHookModifierData *hmd = (GpencilHookModifierData *)md;
hmd->curfalloff = newdataadr(fd, hmd->curfalloff);
@@ -5379,7 +5379,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
direct_link_curvemapping(fd, hmd->curfalloff);
}
}
- else if (md->type == eModifierType_GpencilThick) {
+ else if (md->type == eModifierType_Gpencil_Thick) {
GpencilThickModifierData *gpmd = (GpencilThickModifierData *)md;
gpmd->cur_thickness = newdataadr(fd, gpmd->cur_thickness);
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index aba6dd9358b..f6f66561e54 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1613,14 +1613,14 @@ static void write_modifiers(WriteData *wd, ListBase *modbase)
writedata(wd, DATA, sizeof(int) * hmd->totindex, hmd->indexar);
}
- else if (md->type == eModifierType_GpencilThick) {
+ else if (md->type == eModifierType_Gpencil_Thick) {
GpencilThickModifierData *gpmd = (GpencilThickModifierData *)md;
if (gpmd->cur_thickness) {
write_curvemapping(wd, gpmd->cur_thickness);
}
}
- else if (md->type == eModifierType_GpencilHook) {
+ else if (md->type == eModifierType_Gpencil_Hook) {
GpencilHookModifierData *gpmd = (GpencilHookModifierData *)md;
if (gpmd->curfalloff) {
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 5d41afac774..6b080a7c405 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -1111,7 +1111,7 @@ void gpencil_instance_modifiers(GPENCIL_StorageList *stl, Object *ob)
if (((md->mode & eModifierMode_Realtime) && (stl->storage->is_render == false)) ||
((md->mode & eModifierMode_Render) && (stl->storage->is_render == true)))
{
- if (md->type == eModifierType_GpencilInstance) {
+ if (md->type == eModifierType_Gpencil_Instance) {
GpencilInstanceModifierData *mmd = (GpencilInstanceModifierData *)md;
/* Only add instances if the "Make Objects" flag is set
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 0c206d3e5aa..a40b3dc9035 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -996,43 +996,43 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
break;
/* GPencil Modifiers */
- case eModifierType_GpencilNoise:
+ case eModifierType_Gpencil_Noise:
ICON_DRAW(ICON_RNDCURVE);
break;
- case eModifierType_GpencilSubdiv:
+ case eModifierType_Gpencil_Subdiv:
ICON_DRAW(ICON_MOD_SUBSURF);
break;
- case eModifierType_GpencilThick:
+ case eModifierType_Gpencil_Thick:
ICON_DRAW(ICON_MAN_ROT);
break;
- case eModifierType_GpencilTint:
+ case eModifierType_Gpencil_Tint:
ICON_DRAW(ICON_COLOR);
break;
- case eModifierType_GpencilInstance:
+ case eModifierType_Gpencil_Instance:
ICON_DRAW(ICON_MOD_ARRAY);
break;
- case eModifierType_GpencilBuild:
+ case eModifierType_Gpencil_Build:
ICON_DRAW(ICON_MOD_BUILD);
break;
- case eModifierType_GpencilOpacity:
+ case eModifierType_Gpencil_Opacity:
ICON_DRAW(ICON_MOD_MASK);
break;
- case eModifierType_GpencilColor:
+ case eModifierType_Gpencil_Color:
ICON_DRAW(ICON_GROUP_VCOL);
break;
- case eModifierType_GpencilLattice:
+ case eModifierType_Gpencil_Lattice:
ICON_DRAW(ICON_MOD_LATTICE);
break;
- case eModifierType_GpencilSimplify:
+ case eModifierType_Gpencil_Simplify:
ICON_DRAW(ICON_MOD_DECIM);
break;
- case eModifierType_GpencilSmooth:
+ case eModifierType_Gpencil_Smooth:
ICON_DRAW(ICON_MOD_SMOOTH);
break;
- case eModifierType_GpencilHook:
+ case eModifierType_Gpencil_Hook:
ICON_DRAW(ICON_HOOK);
break;
- case eModifierType_GpencilOffset:
+ case eModifierType_Gpencil_Offset:
ICON_DRAW(ICON_MOD_DISPLACE);
break;
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index f0f9d1ed3a9..6b82b32c734 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -89,19 +89,19 @@ typedef enum ModifierType {
eModifierType_CorrectiveSmooth = 51,
eModifierType_MeshSequenceCache = 52,
eModifierType_SurfaceDeform = 53,
- eModifierType_GpencilNoise = 54,
- eModifierType_GpencilSubdiv = 55,
- eModifierType_GpencilThick = 56,
- eModifierType_GpencilTint = 57,
- eModifierType_GpencilInstance = 58,
- eModifierType_GpencilBuild = 59,
- eModifierType_GpencilOpacity = 60,
- eModifierType_GpencilColor = 61,
- eModifierType_GpencilLattice = 62,
- eModifierType_GpencilSimplify = 63,
- eModifierType_GpencilSmooth = 64,
- eModifierType_GpencilHook = 65,
- eModifierType_GpencilOffset = 66,
+ eModifierType_Gpencil_Noise = 54,
+ eModifierType_Gpencil_Subdiv = 55,
+ eModifierType_Gpencil_Thick = 56,
+ eModifierType_Gpencil_Tint = 57,
+ eModifierType_Gpencil_Instance = 58,
+ eModifierType_Gpencil_Build = 59,
+ eModifierType_Gpencil_Opacity = 60,
+ eModifierType_Gpencil_Color = 61,
+ eModifierType_Gpencil_Lattice = 62,
+ eModifierType_Gpencil_Simplify = 63,
+ eModifierType_Gpencil_Smooth = 64,
+ eModifierType_Gpencil_Hook = 65,
+ eModifierType_Gpencil_Offset = 66,
NUM_MODIFIER_TYPES
} ModifierType;
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index c0741460cea..f6cf5d66bb7 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -124,21 +124,21 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = {
/* Grease Pencil Modifiers */
{0, "", 0, N_("Generate"), "" },
- {eModifierType_GpencilInstance, "GP_INSTANCE", ICON_MOD_ARRAY, "Instance", "Create grid of duplicate instances"},
- {eModifierType_GpencilBuild, "GP_BUILD", ICON_MOD_BUILD, "Build", "Create duplication of strokes"},
- {eModifierType_GpencilSimplify, "GP_SIMPLIFY", ICON_MOD_DECIM, "Simplify", "Simplify stroke reducing number of points"},
- {eModifierType_GpencilSubdiv, "GP_SUBDIV", ICON_MOD_SUBSURF, "Subdivide", "Subdivide stroke adding more control points"},
+ {eModifierType_Gpencil_Instance, "GP_INSTANCE", ICON_MOD_ARRAY, "Instance", "Create grid of duplicate instances"},
+ {eModifierType_Gpencil_Build, "GP_BUILD", ICON_MOD_BUILD, "Build", "Create duplication of strokes"},
+ {eModifierType_Gpencil_Simplify, "GP_SIMPLIFY", ICON_MOD_DECIM, "Simplify", "Simplify stroke reducing number of points"},
+ {eModifierType_Gpencil_Subdiv, "GP_SUBDIV", ICON_MOD_SUBSURF, "Subdivide", "Subdivide stroke adding more control points"},
{0, "", 0, N_("Deform"), "" },
- {eModifierType_GpencilHook, "GP_HOOK", ICON_HOOK, "Hook", "Deform stroke points using objects"},
- {eModifierType_GpencilLattice, "GP_LATTICE", ICON_MOD_LATTICE, "Lattice", "Deform strokes using lattice"},
- {eModifierType_GpencilNoise, "GP_NOISE", ICON_RNDCURVE, "Noise", "Add noise to strokes"},
- {eModifierType_GpencilOffset, "GP_OFFSET", ICON_MOD_DISPLACE, "Offset", "Change stroke location, rotation or scale"},
- {eModifierType_GpencilSmooth, "GP_SMOOTH", ICON_MOD_SMOOTH, "Smooth", "Smooth stroke"},
- {eModifierType_GpencilThick, "GP_THICK", ICON_MAN_ROT, "Thickness", "Change stroke thickness"},
+ {eModifierType_Gpencil_Hook, "GP_HOOK", ICON_HOOK, "Hook", "Deform stroke points using objects"},
+ {eModifierType_Gpencil_Lattice, "GP_LATTICE", ICON_MOD_LATTICE, "Lattice", "Deform strokes using lattice"},
+ {eModifierType_Gpencil_Noise, "GP_NOISE", ICON_RNDCURVE, "Noise", "Add noise to strokes"},
+ {eModifierType_Gpencil_Offset, "GP_OFFSET", ICON_MOD_DISPLACE, "Offset", "Change stroke location, rotation or scale"},
+ {eModifierType_Gpencil_Smooth, "GP_SMOOTH", ICON_MOD_SMOOTH, "Smooth", "Smooth stroke"},
+ {eModifierType_Gpencil_Thick, "GP_THICK", ICON_MAN_ROT, "Thickness", "Change stroke thickness"},
{0, "", 0, N_("Color"), "" },
- {eModifierType_GpencilColor, "GP_COLOR", ICON_GROUP_VCOL, "Hue/Saturation", "Apply chan
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list