Commit: 98b6f941f2268e637d5d6a9535b0a47978a83bdc
Author: Antonio Vazquez
Date: Tue Jun 19 10:37:40 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rB98b6f941f2268e637d5d6a9535b0a47978a83bdc
Rename structs because exceed the RNA name supported limit
===================================================================
M source/blender/blenkernel/BKE_gpencil.h
M source/blender/blenkernel/BKE_gpencil_modifier.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_utils.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/include/ED_object.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/MOD_gpencil_modifiertypes.h
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/makesdna/DNA_object_types.h
M source/blender/makesrna/intern/rna_gpencil_modifier.c
M source/blender/makesrna/intern/rna_object.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_gpencil.h
b/source/blender/blenkernel/BKE_gpencil.h
index 3db49b5b968..00db0e3bded 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -33,7 +33,7 @@
struct CurveMapping;
struct Depsgraph;
-struct GreasePencilModifierData;
+struct GpencilModifierData;
struct ToolSettings;
struct ListBase;
struct bGPdata;
@@ -49,9 +49,9 @@ struct BoundBox;
struct Brush;
struct Object;
struct bDeformGroup;
-struct SimplifyGreasePencilModifierData;
-struct InstanceGreasePencilModifierData;
-struct LatticeGreasePencilModifierData;
+struct SimplifyGpencilModifierData;
+struct InstanceGpencilModifierData;
+struct LatticeGpencilModifierData;
struct MDeformVert;
struct MDeformWeight;
diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h
b/source/blender/blenkernel/BKE_gpencil_modifier.h
index 9d13966146a..4c056cf06cb 100644
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@@ -41,7 +41,7 @@ struct ViewLayer;
struct ListBase;
struct bArmature;
struct Main;
-struct GreasePencilModifierData;
+struct GpencilModifierData;
struct BMEditMesh;
struct DepsNodeHandle;
struct bGPDlayer;
@@ -91,7 +91,7 @@ typedef void(*GreasePencilObjectWalkFunc)(void *userData,
struct Object *ob, str
typedef void(*GreasePencilIDWalkFunc)(void *userData, struct Object *ob,
struct ID **idpoin, int cb_flag);
typedef void(*GreasePencilTexWalkFunc)(void *userData, struct Object *ob,
struct ModifierData *md, const char *propname);
-typedef struct GreasePencilModifierTypeInfo {
+typedef struct GpencilModifierTypeInfo {
/* The user visible name for this modifier */
char name[32];
@@ -112,7 +112,7 @@ typedef struct GreasePencilModifierTypeInfo {
/* Copy instance data for this modifier type. Should copy all user
* level settings to the target modifier.
*/
- void (*copyData)(const struct GreasePencilModifierData *md, struct
GreasePencilModifierData *target);
+ void (*copyData)(const struct GpencilModifierData *md, struct
GpencilModifierData *target);
/* Callback for GP "stroke" modifiers that operate on the
* shape and parameters of the provided strokes (e.g. Thickness, Noise,
etc.)
@@ -125,7 +125,7 @@ typedef struct GreasePencilModifierTypeInfo {
* 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 GreasePencilModifierData *md, struct
Depsgraph *depsgraph,
+ void (*gp_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
@@ -139,7 +139,7 @@ typedef struct GreasePencilModifierTypeInfo {
* The modifier_index parameter indicates where the modifier is
* in the modifier stack in relation to other modifiers.
*/
- void (*gp_generateStrokes)(struct GreasePencilModifierData *md, struct
Depsgraph *depsgraph,
+ void (*gp_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.
@@ -149,7 +149,7 @@ typedef struct GreasePencilModifierTypeInfo {
* datablock, mutating the geometry and/or creating new
datablocks/objects
*/
void (*gp_bakeModifier)(struct Main *bmain, struct Depsgraph *depsgraph,
- struct GreasePencilModifierData *md, struct Object
*ob);
+ struct GpencilModifierData *md, struct Object *ob);
/********************* Optional functions *********************/
@@ -158,14 +158,14 @@ typedef struct GreasePencilModifierTypeInfo {
*
* This function is optional.
*/
- void (*initData)(struct GreasePencilModifierData *md);
+ void (*initData)(struct GpencilModifierData *md);
/* Free internal modifier data variables, this function should
* not free the md variable itself.
*
* This function is optional.
*/
- void (*freeData)(struct GreasePencilModifierData *md);
+ void (*freeData)(struct GpencilModifierData *md);
/* Return a boolean value indicating if this modifier is able to be
* calculated based on the modifier data. This is *not* regarding the
@@ -175,13 +175,13 @@ typedef struct GreasePencilModifierTypeInfo {
*
* This function is optional (assumes never disabled if not present).
*/
- bool (*isDisabled)(struct GreasePencilModifierData *md, int
userRenderParams);
+ bool (*isDisabled)(struct GpencilModifierData *md, int
userRenderParams);
/* Add the appropriate relations to the dependency graph.
*
* This function is optional.
*/
- void (*updateDepsgraph)(struct GreasePencilModifierData *md,
+ void (*updateDepsgraph)(struct GpencilModifierData *md,
const struct ModifierUpdateDepsgraphContext
*ctx);
/* Should return true if the modifier needs to be recalculated on time
@@ -189,7 +189,7 @@ typedef struct GreasePencilModifierTypeInfo {
*
* This function is optional (assumes false if not present).
*/
- bool (*dependsOnTime)(struct GreasePencilModifierData *md);
+ bool (*dependsOnTime)(struct GpencilModifierData *md);
/* True when a deform modifier uses normals, the requiredDataMask
@@ -199,7 +199,7 @@ typedef struct GreasePencilModifierTypeInfo {
* this is needed because applying 2 deform modifiers will give the
* second modifier bogus normals.
* */
- bool (*dependsOnNormals)(struct GreasePencilModifierData *md);
+ bool (*dependsOnNormals)(struct GpencilModifierData *md);
/* Should call the given walk function on with a pointer to each Object
@@ -208,7 +208,7 @@ typedef struct GreasePencilModifierTypeInfo {
*
* This function is optional.
*/
- void (*foreachObjectLink)(struct GreasePencilModifierData *md, struct
Object *ob,
+ void (*foreachObjectLink)(struct GpencilModifierData *md, struct Object
*ob,
GreasePencilObjectWalkFunc walk, void
*userData);
/* Should call the given walk function with a pointer to each ID
@@ -219,7 +219,7 @@ typedef struct GreasePencilModifierTypeInfo {
* This function is optional. If it is not present, foreachObjectLink
* will be used.
*/
- void (*foreachIDLink)(struct GreasePencilModifierData *md, struct
Object *ob,
+ void (*foreachIDLink)(struct GpencilModifierData *md, struct Object *ob,
GreasePencilIDWalkFunc walk, void *userData);
/* Should call the given walk function for each texture that the
@@ -229,24 +229,24 @@ typedef struct GreasePencilModifierTypeInfo {
* This function is optional. If it is not present, it will be
* assumed the modifier has no textures.
*/
- void (*foreachTexLink)(struct GreasePencilModifierData *md, struct
Object *ob,
+ void (*foreachTexLink)(struct GpencilModifierData *md, struct Object
*ob,
GreasePencilTexWalkFunc walk, void *userData);
-} GreasePencilModifierTypeInfo;
+} GpencilModifierTypeInfo;
-void BKE_gpencil_instance_modifier_instance_tfm(struct
InstanceGreasePencilModifierData *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]);
/* Initialize modifier's global data (type info and some common global
storages). */
void BKE_gpencil_modifier_init(void);
-const GreasePencilModifierTypeInfo
*BKE_gpencil_modifierType_getInfo(GreasePencilModifierType type);
-struct GreasePencilModifierData *BKE_gpencil_modifier_new(int type);
-void BKE_gpencil_modifier_free_ex(struct GreasePencilModifierData *md, const
int flag);
-void BKE_gpencil_modifier_free(struct GreasePencilModifierData *md);
-bool BKE_gpencil_modifier_unique_name(struct ListBase *modifiers, struct
GreasePencilModifierData *gmd);
-struct GreasePencilModifierData *BKE_gpencil_modifiers_findByType(struct
Object *ob, GreasePencilModifierType type);
-struct GreasePencilModifierData *BKE_gpencil_modifiers_findByName(struct
Object *ob, const char *name);
-void BKE_gpencil_modifier_copyData_generic(const struct
GreasePencilModifierData *md_src, struct GreasePencilModifierData *md_dst);
-void BKE_gpencil_modifier_copyData(struct GreasePencilModifierData *md, struct
GreasePencilModifierData *target);
+const GpencilModifierTypeInfo
*BKE_gpencil_modifierType_getInfo(GreasePencilModifierType 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_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);
int BKE_gpencil_modifiers_getCageIndex(struct Scene *scene, struct Object *ob,
int *r_lastPossibleCageIndex, bool is_virtual);
diff --git a/source/blender/blenkernel/BKE_object.h
b/source/blender/blenkernel/BKE_object.h
index 7b6ff4574f9..20b9cfd2c07 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -50,7 +50,7 @@ struct Mesh;
struct RigidBodyWorld;
struct HookModifierData;
struct ModifierData;
-struct HookGreasePencilModifierData;
+struct HookGpencilModifierData;
#include "DNA_object_enums.h"
@@ -72,7 +72,7 @@ void BKE_object_free_derived_mesh_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
HookGreasePencilMod
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
