Commit: f2aed3a64d15a3ac90f80b5b66d03b08e98b8081
Author: Antonio Vazquez
Date: Wed Jun 20 16:10:47 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rBf2aed3a64d15a3ac90f80b5b66d03b08e98b8081
Fix some functions after merge
===================================================================
M source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
M source/blender/makesdna/DNA_gpencil_modifier_types.h
===================================================================
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
index 7d7362287dd..a4db8749290 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
@@ -79,7 +79,7 @@ static void initData(GpencilModifierData *md)
gpmd->vrand2 = 1.0;
}
-static void freeData(ModifierData *md)
+static void freeData(GpencilModifierData *md)
{
NoiseGpencilModifierData *mmd = (NoiseGpencilModifierData *)md;
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h
b/source/blender/makesdna/DNA_gpencil_modifier_types.h
index a3557391da7..7dabd3d7a8d 100644
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@ -32,6 +32,8 @@
* (ONLY ADD NEW ITEMS AT THE END)
*/
+struct RNG;
+
typedef enum GpencilModifierType {
eGpencilModifierType_None = 0,
eGpencilModifierType_Noise = 1,
@@ -85,6 +87,7 @@ typedef struct NoiseGpencilModifierData {
int gp_frame; /* last gp frame used */
int scene_frame; /* last scene frame used */
float vrand1, vrand2; /* random values */
+ struct RNG *rng;
} NoiseGpencilModifierData;
typedef enum eNoiseGpencil_Flag {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
