[Bf-blender-cvs] [e7f47760745] temp-greasepencil-object-stacksplit: Final change to make it build

Dalai Felinto noreply at git.blender.org
Mon Jun 18 18:36:28 CEST 2018


Commit: e7f477607458e8a65af7a9a7d200ff105850d14e
Author: Dalai Felinto
Date:   Mon Jun 18 18:36:10 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rBe7f477607458e8a65af7a9a7d200ff105850d14e

Final change to make it build

===================================================================

M	source/blender/blenkernel/BKE_gpencil_modifier.h
M	source/blender/blenkernel/intern/gpencil_modifier.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h
index d0be698073b..9d13966146a 100644
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@@ -87,9 +87,9 @@ typedef enum {
 } GreasePencilModifierTypeFlag;
 
 /* IMPORTANT! Keep ObjectWalkFunc and IDWalkFunc signatures compatible. */
-typedef void(*ObjectWalkFunc)(void *userData, struct Object *ob, struct Object **obpoin, int cb_flag);
-typedef void(*IDWalkFunc)(void *userData, struct Object *ob, struct ID **idpoin, int cb_flag);
-typedef void(*TexWalkFunc)(void *userData, struct Object *ob, struct ModifierData *md, const char *propname);
+typedef void(*GreasePencilObjectWalkFunc)(void *userData, struct Object *ob, struct Object **obpoin, int cb_flag);
+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 {
 	/* The user visible name for this modifier */
@@ -209,7 +209,7 @@ typedef struct GreasePencilModifierTypeInfo {
 	 * This function is optional.
 	 */
 	void (*foreachObjectLink)(struct GreasePencilModifierData *md, struct Object *ob,
-	                          ObjectWalkFunc walk, void *userData);
+	                          GreasePencilObjectWalkFunc walk, void *userData);
 
 	/* Should call the given walk function with a pointer to each ID
 	 * pointer (i.e. each datablock pointer) that the modifier data
@@ -220,7 +220,7 @@ typedef struct GreasePencilModifierTypeInfo {
 	 * will be used.
 	 */
 	void (*foreachIDLink)(struct GreasePencilModifierData *md, struct Object *ob,
-	                      IDWalkFunc walk, void *userData);
+	                      GreasePencilIDWalkFunc walk, void *userData);
 
 	/* Should call the given walk function for each texture that the
 	 * modifier data stores. This is used for finding all textures in
@@ -230,7 +230,7 @@ typedef struct GreasePencilModifierTypeInfo {
 	 * assumed the modifier has no textures.
 	 */
 	void (*foreachTexLink)(struct GreasePencilModifierData *md, struct Object *ob,
-	                       TexWalkFunc walk, void *userData);
+	                       GreasePencilTexWalkFunc walk, void *userData);
 } GreasePencilModifierTypeInfo;
 
 void BKE_gpencil_instance_modifier_instance_tfm(struct InstanceGreasePencilModifierData *mmd, const int elem_idx[3], float r_mat[4][4]);
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 2b658167ae4..2716a754d63 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -459,7 +459,7 @@ void BKE_gpencil_eval_geometry(Depsgraph *depsgraph,
 void BKE_gpencil_modifier_init(void)
 {
 	/* Initialize modifier types */
-	gpencil_modifier_type_init(modifier_gpencil_types); /* MOD_gpencil_utils.c */
+	gpencil_modifier_type_init(modifier_gpencil_types); /* MOD_gpencil_util.c */
 }
 
 GreasePencilModifierData *BKE_gpencil_modifier_new(int type)
@@ -499,7 +499,7 @@ void BKE_gpencil_modifier_free_ex(GreasePencilModifierData *md, const int flag)
 			mti->foreachIDLink(md, NULL, modifier_free_data_id_us_cb, NULL);
 		}
 		else if (mti->foreachObjectLink) {
-			mti->foreachObjectLink(md, NULL, (ObjectWalkFunc)modifier_free_data_id_us_cb, NULL);
+			mti->foreachObjectLink(md, NULL, (GreasePencilObjectWalkFunc)modifier_free_data_id_us_cb, NULL);
 		}
 	}
 
@@ -576,7 +576,7 @@ void BKE_gpencil_modifier_copyData_ex(GreasePencilModifierData *md, GreasePencil
 			mti->foreachIDLink(target, NULL, gpencil_modifier_copy_data_id_us_cb, NULL);
 		}
 		else if (mti->foreachObjectLink) {
-			mti->foreachObjectLink(target, NULL, (ObjectWalkFunc)gpencil_modifier_copy_data_id_us_cb, NULL);
+			mti->foreachObjectLink(target, NULL, (GreasePencilObjectWalkFunc)gpencil_modifier_copy_data_id_us_cb, NULL);
 		}
 	}
 }



More information about the Bf-blender-cvs mailing list