[Bf-blender-cvs] [90a28f2f088] temp-greasepencil-object-stacksplit: Cleanup: Rename to keep naming convention
Antonio Vazquez
noreply at git.blender.org
Tue Jun 19 10:42:12 CEST 2018
Commit: 90a28f2f088302d61c5074d660a24a941141bcb8
Author: Antonio Vazquez
Date: Tue Jun 19 10:42:01 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rB90a28f2f088302d61c5074d660a24a941141bcb8
Cleanup: Rename to keep naming convention
This is required after previous rename due RNA limits.
===================================================================
M source/blender/blenkernel/BKE_gpencil.h
M source/blender/blenkernel/BKE_gpencil_modifier.h
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_utils.c
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/object/object_gpencil_modifier.c
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/gpencil_modifiers/intern/MOD_gpencil_util.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
M source/blender/makesdna/DNA_gpencil_modifier_types.h
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/rna_gpencil_modifier.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_ui_api.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index 00db0e3bded..85a067f1419 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -115,9 +115,9 @@ struct bGPDstroke *BKE_gpencil_add_stroke(struct bGPDframe *gpf, int mat_idx, in
#define GPENCIL_ALPHA_OPACITY_THRESH 0.001f
#define GPENCIL_STRENGTH_MIN 0.003f
-#define GPENCIL_MODIFIER_ACTIVE(_md, _is_render) (((_md->mode & eGreasePencilModifierMode_Realtime) && (_is_render == false)) || \
- ((_md->mode & eGreasePencilModifierMode_Render) && (_is_render == true)))
-#define GPENCIL_MODIFIER_EDIT(_md, _is_edit) (((_md->mode & eGreasePencilModifierMode_Editmode) == 0) && (_is_edit))
+#define GPENCIL_MODIFIER_ACTIVE(_md, _is_render) (((_md->mode & eGpencilModifierMode_Realtime) && (_is_render == false)) || \
+ ((_md->mode & eGpencilModifierMode_Render) && (_is_render == true)))
+#define GPENCIL_MODIFIER_EDIT(_md, _is_edit) (((_md->mode & eGpencilModifierMode_Editmode) == 0) && (_is_edit))
bool gpencil_layer_is_editable(const struct bGPDlayer *gpl);
diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h
index 4c056cf06cb..43d796639df 100644
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@@ -51,17 +51,17 @@ struct ModifierUpdateDepsgraphContext;
typedef enum {
/* Should not be used, only for None modifier type */
- eGreasePencilModifierTypeType_None,
+ eGpencilModifierTypeType_None,
/* grease pencil modifiers */
- eGreasePencilModifierTypeType_Gpencil,
-} GreasePencilModifierTypeType;
+ eGpencilModifierTypeType_Gpencil,
+} GpencilModifierTypeType;
typedef enum {
- eGreasePencilModifierTypeFlag_AcceptsMesh = (1 << 0),
- eGreasePencilModifierTypeFlag_AcceptsCVs = (1 << 1),
- eGreasePencilModifierTypeFlag_SupportsMapping = (1 << 2),
- eGreasePencilModifierTypeFlag_SupportsEditmode = (1 << 3),
+ eGpencilModifierTypeFlag_AcceptsMesh = (1 << 0),
+ eGpencilModifierTypeFlag_AcceptsCVs = (1 << 1),
+ eGpencilModifierTypeFlag_SupportsMapping = (1 << 2),
+ eGpencilModifierTypeFlag_SupportsEditmode = (1 << 3),
/* For modifiers that support editmode this determines if the
* modifier should be enabled by default in editmode. This should
@@ -69,22 +69,22 @@ typedef enum {
* also generally used in editmode, otherwise let the user enable
* it by hand.
*/
- eGreasePencilModifierTypeFlag_EnableInEditmode = (1 << 4),
+ eGpencilModifierTypeFlag_EnableInEditmode = (1 << 4),
/* For modifiers that require original data and so cannot
* be placed after any non-deformative modifier.
*/
- eGreasePencilModifierTypeFlag_RequiresOriginalData = (1 << 5),
+ eGpencilModifierTypeFlag_RequiresOriginalData = (1 << 5),
/* max one per type */
- eGreasePencilModifierTypeFlag_Single = (1 << 6),
+ eGpencilModifierTypeFlag_Single = (1 << 6),
/* Grease pencil modifiers */
- eGreasePencilModifierTypeFlag_GpencilMod = (1 << 7),
+ eGpencilModifierTypeFlag_GpencilMod = (1 << 7),
/* can't be added manually by user */
- eGreasePencilModifierTypeFlag_NoUserAdd = (1 << 8),
-} GreasePencilModifierTypeFlag;
+ eGpencilModifierTypeFlag_NoUserAdd = (1 << 8),
+} GpencilModifierTypeFlag;
/* IMPORTANT! Keep ObjectWalkFunc and IDWalkFunc signatures compatible. */
typedef void(*GreasePencilObjectWalkFunc)(void *userData, struct Object *ob, struct Object **obpoin, int cb_flag);
@@ -103,8 +103,8 @@ typedef struct GpencilModifierTypeInfo {
/* The size of the modifier data type, used by allocation. */
int structSize;
- GreasePencilModifierType type;
- GreasePencilModifierTypeFlag flags;
+ GpencilModifierType type;
+ GpencilModifierTypeFlag flags;
/********************* Non-optional functions *********************/
@@ -238,12 +238,12 @@ void BKE_gpencil_instance_modifier_instance_tfm(struct InstanceGpencilModifierDa
/* Initialize modifier's global data (type info and some common global storages). */
void BKE_gpencil_modifier_init(void);
-const GpencilModifierTypeInfo *BKE_gpencil_modifierType_getInfo(GreasePencilModifierType type);
+const GpencilModifierTypeInfo *BKE_gpencil_modifierType_getInfo(GpencilModifierType type);
struct GpencilModifierData *BKE_gpencil_modifier_new(int type);
void BKE_gpencil_modifier_free_ex(struct GpencilModifierData *md, const int flag);
void BKE_gpencil_modifier_free(struct GpencilModifierData *md);
bool BKE_gpencil_modifier_unique_name(struct ListBase *modifiers, struct GpencilModifierData *gmd);
-struct GpencilModifierData *BKE_gpencil_modifiers_findByType(struct Object *ob, GreasePencilModifierType type);
+struct GpencilModifierData *BKE_gpencil_modifiers_findByType(struct Object *ob, GpencilModifierType type);
struct GpencilModifierData *BKE_gpencil_modifiers_findByName(struct Object *ob, const char *name);
void BKE_gpencil_modifier_copyData_generic(const struct GpencilModifierData *md_src, struct GpencilModifierData *md_dst);
void BKE_gpencil_modifier_copyData(struct GpencilModifierData *md, struct GpencilModifierData *target);
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 806188bcb12..6bc68cfd3c1 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -326,7 +326,7 @@ void BKE_gpencil_lattice_init(Object *ob)
{
GpencilModifierData *md;
for (md = ob->greasepencil_modifiers.first; md; md = md->next) {
- if (md->type == eGreasePencilModifierType_Lattice) {
+ if (md->type == eGpencilModifierType_Lattice) {
LatticeGpencilModifierData *mmd = (LatticeGpencilModifierData *)md;
Object *latob = NULL;
@@ -349,7 +349,7 @@ void BKE_gpencil_lattice_clear(Object *ob)
{
GpencilModifierData *md;
for (md = ob->greasepencil_modifiers.first; md; md = md->next) {
- if (md->type == eGreasePencilModifierType_Lattice) {
+ if (md->type == eGpencilModifierType_Lattice) {
LatticeGpencilModifierData *mmd = (LatticeGpencilModifierData *)md;
if ((mmd) && (mmd->cache_data)) {
end_latt_deform((struct LatticeDeformData *)mmd->cache_data);
@@ -471,11 +471,11 @@ GpencilModifierData *BKE_gpencil_modifier_new(int type)
BLI_strncpy(md->name, DATA_(mti->name), sizeof(md->name));
md->type = type;
- md->mode = eGreasePencilModifierMode_Realtime | eGreasePencilModifierMode_Render | eGreasePencilModifierMode_Expanded;
- md->flag = eGreasePencilModifierFlag_StaticOverride_Local;
+ md->mode = eGpencilModifierMode_Realtime | eGpencilModifierMode_Render | eGpencilModifierMode_Expanded;
+ md->flag = eGpencilModifierFlag_StaticOverride_Local;
- if (mti->flags & eGreasePencilModifierTypeFlag_EnableInEditmode)
- md->mode |= eGreasePencilModifierMode_Editmode;
+ if (mti->flags & eGpencilModifierTypeFlag_EnableInEditmode)
+ md->mode |= eGpencilModifierMode_Editmode;
if (mti->initData) mti->initData(md);
@@ -524,7 +524,7 @@ bool BKE_gpencil_modifier_unique_name(ListBase *modifiers, GpencilModifierData *
return false;
}
-const GpencilModifierTypeInfo *BKE_gpencil_modifierType_getInfo(GreasePencilModifierType type)
+const GpencilModifierTypeInfo *BKE_gpencil_modifierType_getInfo(GpencilModifierType type)
{
/* type unsigned, no need to check < 0 */
if (type < NUM_GREASEPENCIL_MODIFIER_TYPES && modifier_gpencil_types[type]->name[0] != '\0') {
@@ -586,7 +586,7 @@ void BKE_gpencil_modifier_copyData(GpencilModifierData *md, GpencilModifierData
BKE_gpencil_modifier_copyData_ex(md, target, 0);
}
-GpencilModifierData *BKE_gpencil_modifiers_findByType(Object *ob, GreasePencilModifierType type)
+GpencilModifierData *BKE_gpencil_modifiers_findByType(Object *ob, GpencilModifierType type)
{
GpencilModifierData *md = ob->greasepencil_modifiers.first;
@@ -623,10 +623,10 @@ int BKE_gpencil_modifiers_getCageIndex(struct Scene *scene, Object *ob, int *r_l
md->scene = scene;
if (mti->isDisabled && mti->isDisabled(md, 0)) continue;
- if (!(mti->flags & eGreasePencilModifierTypeFlag_SupportsEditmode)) continue;
+ if (!(mti->flags & eGpencilModifierTypeFlag_SupportsEditmode)) continue;
- if (!(md->mode & eGreasePencilModifierMode_Realtime)) continue;
- if (!(md->mode & eGreasePencilModifierMode_Editmode)) continue;
+ if (!(md->mode & eGpencilModifierMode_Realtime)) continue;
+ if (!(md->mode & eGpencilModifierMode_Editmode)) continue;
}
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index d626f3851e0..6cd678716aa 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5404,11 +5404,11 @@ static void direct_link_gpencil_modifiers(FileData *fd, ListBase *lb)
if (NULL == modifierType_getInfo(md->type))
md->type = eModifierType_None;
- if (md->type == eGreasePencilModifierType_Lattice) {
+ if (md->type == eGpencilModifierType_Lattice) {
LatticeGpencilModifierData *gpmd = (LatticeGpencilModifierData*)md;
gpmd->cache_data = NULL;
}
- else if (md->type == eGreasePencilModifierType_Hook) {
+ else if (md->type == eGpencilModifierType_Hook) {
HookGpencilModifierData *hmd = (HookGpencilModifierData *)md;
hmd->curfalloff = newdataadr(fd, hmd->curfalloff);
@@ -5416,7 +5416,7 @@ static void direct_link_gpencil_modifiers(FileData *fd, ListBase *lb)
direct_link_curvemapping(fd, hmd->curfalloff);
}
}
- else if (md->type == eGreasePencilModifierType_Thick) {
+ else if (md->type == eGpencilModifierType_Thick) {
ThickGpencilModifierData *gpmd = (ThickGpencilModifierData *)md;
gpmd->curve_thickness = newdataadr(fd, gpmd->curve_thickness);
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 9ff5969fafd..76b8d4446db 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1780,14 +1780,14 @@ static void write_gpencil_modifiers(WriteData *wd, ListBase *modbase)
writestruct_id(wd, DATA, mti->structName, 1, md);
- if (md->type == eGreasePencilModifierType_Thick) {
+ if (md->type == eGpe
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list