[Bf-blender-cvs] [d0946b84209] greasepencil-object: Rename Gpencil<ModName>ModifierData to <ModName>GPencilModifierData
Antonio Vazquez
noreply at git.blender.org
Thu May 10 17:53:00 CEST 2018
Commit: d0946b84209df42a3ce05dab235ac6dbed21b8c7
Author: Antonio Vazquez
Date: Thu May 10 17:52:49 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBd0946b84209df42a3ce05dab235ac6dbed21b8c7
Rename Gpencil<ModName>ModifierData to <ModName>GPencilModifierData
===================================================================
M source/blender/blenkernel/BKE_gpencil.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/blenkernel/intern/object.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/makesdna/DNA_modifier_types.h
M source/blender/makesrna/intern/rna_modifier.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
===================================================================
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index a9a6aa7540d..6c86aff5085 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -48,9 +48,9 @@ struct BoundBox;
struct Brush;
struct Object;
struct bDeformGroup;
-struct GpencilSimplifyModifierData;
-struct GpencilInstanceModifierData;
-struct GpencilLatticeModifierData;
+struct SimplifyGpencilModifierData;
+struct InstanceGpencilModifierData;
+struct LatticeGpencilModifierData;
/* ------------ Grease-Pencil API ------------------ */
@@ -168,7 +168,7 @@ void BKE_gpencil_geometry_modifiers(
struct Depsgraph *depsgraph, struct Object *ob,
struct bGPDlayer *gpl, struct bGPDframe *gpf, bool is_render);
-void BKE_gpencil_instance_modifier_instance_tfm(struct GpencilInstanceModifierData *mmd, const int elem_idx[3], float r_mat[4][4]);
+void BKE_gpencil_instance_modifier_instance_tfm(struct InstanceGpencilModifierData *mmd, const int elem_idx[3], float r_mat[4][4]);
void BKE_gpencil_lattice_init(struct Object *ob);
void BKE_gpencil_lattice_clear(struct Object *ob);
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index fd89cfbbc25..812e0aa0a21 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -49,7 +49,7 @@ struct Main;
struct RigidBodyWorld;
struct HookModifierData;
struct ModifierData;
-struct GpencilHookModifierData;
+struct HookGpencilModifierData;
#include "DNA_object_enums.h"
@@ -70,7 +70,7 @@ void BKE_object_free_derived_caches(struct Object *ob);
void BKE_object_free_caches(struct Object *object);
void BKE_object_modifier_hook_reset(struct Object *ob, struct HookModifierData *hmd);
-void BKE_object_modifier_gpencil_hook_reset(struct Object *ob, struct GpencilHookModifierData *hmd);
+void BKE_object_modifier_gpencil_hook_reset(struct Object *ob, struct HookGpencilModifierData *hmd);
bool BKE_object_support_modifier_type_check(const struct Object *ob, int modifier_type);
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index f5c6910970b..129c3a63e84 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -303,7 +303,7 @@ void BKE_gpencil_lattice_init(Object *ob)
ModifierData *md;
for (md = ob->modifiers.first; md; md = md->next) {
if (md->type == eModifierType_Gpencil_Lattice) {
- GpencilLatticeModifierData *mmd = (GpencilLatticeModifierData *)md;
+ LatticeGpencilModifierData *mmd = (LatticeGpencilModifierData *)md;
Object *latob = NULL;
latob = mmd->object;
@@ -326,7 +326,7 @@ void BKE_gpencil_lattice_clear(Object *ob)
ModifierData *md;
for (md = ob->modifiers.first; md; md = md->next) {
if (md->type == eModifierType_Gpencil_Lattice) {
- GpencilLatticeModifierData *mmd = (GpencilLatticeModifierData *)md;
+ LatticeGpencilModifierData *mmd = (LatticeGpencilModifierData *)md;
if ((mmd) && (mmd->cache_data)) {
end_latt_deform((LatticeDeformData *)mmd->cache_data);
mmd->cache_data = NULL;
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 0a13fa4c0ed..24f093aee63 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -225,7 +225,7 @@ void BKE_object_modifier_hook_reset(Object *ob, HookModifierData *hmd)
}
}
-void BKE_object_modifier_gpencil_hook_reset(Object *ob, GpencilHookModifierData *hmd)
+void BKE_object_modifier_gpencil_hook_reset(Object *ob, HookGpencilModifierData *hmd)
{
/* reset functionality */
if (hmd->object) {
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index eddacd5ffd5..07b8bab4c07 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5368,11 +5368,11 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
}
}
else if (md->type == eModifierType_Gpencil_Lattice) {
- GpencilLatticeModifierData *gpmd = (GpencilLatticeModifierData*)md;
+ LatticeGpencilModifierData *gpmd = (LatticeGpencilModifierData*)md;
gpmd->cache_data = NULL;
}
else if (md->type == eModifierType_Gpencil_Hook) {
- GpencilHookModifierData *hmd = (GpencilHookModifierData *)md;
+ HookGpencilModifierData *hmd = (HookGpencilModifierData *)md;
hmd->curfalloff = newdataadr(fd, hmd->curfalloff);
if (hmd->curfalloff) {
@@ -5380,7 +5380,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
}
}
else if (md->type == eModifierType_Gpencil_Thick) {
- GpencilThickModifierData *gpmd = (GpencilThickModifierData *)md;
+ ThickGpencilModifierData *gpmd = (ThickGpencilModifierData *)md;
gpmd->cur_thickness = newdataadr(fd, gpmd->cur_thickness);
if (gpmd->cur_thickness) {
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index f6f66561e54..b49104e0784 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1614,14 +1614,14 @@ static void write_modifiers(WriteData *wd, ListBase *modbase)
writedata(wd, DATA, sizeof(int) * hmd->totindex, hmd->indexar);
}
else if (md->type == eModifierType_Gpencil_Thick) {
- GpencilThickModifierData *gpmd = (GpencilThickModifierData *)md;
+ ThickGpencilModifierData *gpmd = (ThickGpencilModifierData *)md;
if (gpmd->cur_thickness) {
write_curvemapping(wd, gpmd->cur_thickness);
}
}
else if (md->type == eModifierType_Gpencil_Hook) {
- GpencilHookModifierData *gpmd = (GpencilHookModifierData *)md;
+ HookGpencilModifierData *gpmd = (HookGpencilModifierData *)md;
if (gpmd->curfalloff) {
write_curvemapping(wd, 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 6b080a7c405..2139a846274 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -1049,7 +1049,7 @@ struct GPUTexture *DRW_gpencil_create_blank_texture(int width, int height)
/* Helper for gpencil_instance_modifiers()
* See also MOD_gpencilinstance.c -> bakeModifierGP()
*/
-static void gp_instance_modifier_make_instances(GPENCIL_StorageList *stl, Object *ob, GpencilInstanceModifierData *mmd)
+static void gp_instance_modifier_make_instances(GPENCIL_StorageList *stl, Object *ob, InstanceGpencilModifierData *mmd)
{
/* reset random */
mmd->rnd[0] = 1;
@@ -1112,7 +1112,7 @@ void gpencil_instance_modifiers(GPENCIL_StorageList *stl, Object *ob)
((md->mode & eModifierMode_Render) && (stl->storage->is_render == true)))
{
if (md->type == eModifierType_Gpencil_Instance) {
- GpencilInstanceModifierData *mmd = (GpencilInstanceModifierData *)md;
+ InstanceGpencilModifierData *mmd = (InstanceGpencilModifierData *)md;
/* Only add instances if the "Make Objects" flag is set
* FIXME: This is a workaround for z-ordering weirdness when all instances are in the same object
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 6b82b32c734..d85238ac478 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1651,7 +1651,7 @@ enum {
MOD_SDEF_MODE_CENTROID = 2,
};
-typedef struct GpencilNoiseModifierData {
+typedef struct NoiseGpencilModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
char vgname[64]; /* optional vertexgroup name, MAX_VGROUP_NAME */
@@ -1662,9 +1662,9 @@ typedef struct GpencilNoiseModifierData {
int gp_frame; /* last gp frame used */
int scene_frame; /* last scene frame used */
float vrand1, vrand2; /* random values */
-} GpencilNoiseModifierData;
+} NoiseGpencilModifierData;
-typedef enum eGpencilNoise_Flag {
+typedef enum eNoiseGpencil_Flag {
GP_NOISE_USE_RANDOM = (1 << 0),
GP_NOISE_MOD_LOCATION = (1 << 1),
GP_NOISE_MOD_STRENGTH = (1 << 2),
@@ -1675,24 +1675,24 @@ typedef enum eGpencilNoise_Flag {
GP_NOISE_INVERSE_PASS = (1 << 7),
GP_NOISE_INVERSE_VGROUP = (1 << 8),
GP_NOISE_MOD_UV = (1 << 9),
-} eGpencilNoise_Flag;
+} eNoiseGpencil_Flag;
-typedef struct GpencilSubdivModifierData {
+typedef struct SubdivGpencilModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
int pass_index; /* custom index for passes */
int flag; /* flags */
int level; /* factor of subdivision */
char pad[4];
-} GpencilSubdivModifierData;
+} SubdivGpencilModifierData;
-typedef enum eGpencilSubdiv_Flag {
+typedef enum eSubdivGpencil_Flag {
GP_SUBDIV_SIMPLE = (1 << 0),
GP_SUBDIV_INVERSE_LAYER = (1 << 1),
GP_SUBDIV_INVERSE_PASS = (1 << 2),
-} eGpencilSubdiv_Flag;
+} eSubdivGpencil_Flag;
-typedef struct GpencilThickModifierData {
+typedef struct ThickGpencilModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
char vgname[64]; /* optional vertexgroup name, MAX_VGROUP_NAME */
@@ -1701,47 +1701,47 @@ typedef struct GpencilThickModifierData {
int thickness; /* Thickness change */
char pad[4];
struct CurveMapping *cur_thickness;
-} GpencilThickModifierData;
+} ThickGpencilModifierData;
-typedef enum eGpencilThick_Flag {
+typedef enum eThickGpencil_Flag {
GP_THICK_INVERSE_LAYER = (1 << 0),
GP_THICK_INVERSE_PASS = (1 << 1),
GP_THICK_INVERSE_VGROUP = (1 << 2),
GP_THICK_CUSTOM_CURVE = (1 << 3),
GP_THICK_NORMALIZE = (1 << 4),
-} eGpencilThick_Flag;
+} eThickGpencil_Flag;
-typedef struct GpencilTintModifierData {
+typedef struct TintGpencilModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
int pass_index; /* custom index for passes */
int flag; /* flags */
float rgb[3];
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list