Commit: 1a938ee139d8244fa789c5fb5a578f0ee5a956d1
Author: Antonio Vazquez
Date: Wed Jun 20 16:02:33 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rB1a938ee139d8244fa789c5fb5a578f0ee5a956d1
Merge branch 'greasepencil-object' into temp-greasepencil-object-stacksplit
Conflicts:
source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
source/blender/makesdna/DNA_modifier_types.h
===================================================================
===================================================================
diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
index 1c0b6c94c04,d6e4c98a4b3..7d7362287dd
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
@@@ -71,12 -78,21 +79,21 @@@ static void initData(GpencilModifierDat
gpmd->vrand2 = 1.0;
}
+ static void freeData(ModifierData *md)
+ {
+ NoiseGpencilModifierData *mmd = (NoiseGpencilModifierData *)md;
+
+ if (mmd->rng) {
+ BLI_rng_free(mmd->rng);
+ }
+ }
+
-static void copyData(const ModifierData *md, ModifierData *target)
+static void copyData(const GpencilModifierData *md, GpencilModifierData
*target)
{
- modifier_copyData_generic(md, target);
+ BKE_gpencil_modifier_copyData_generic(md, target);
}
-static bool dependsOnTime(ModifierData *md)
+static bool dependsOnTime(GpencilModifierData *md)
{
NoiseGpencilModifierData *mmd = (NoiseGpencilModifierData *)md;
return (mmd->flag & GP_NOISE_USE_RANDOM) != 0;
@@@ -254,7 -285,8 +271,7 @@@ GpencilModifierTypeInfo modifierType_Gp
/* gp_bakeModifier */ gp_bakeModifier,
/* initData */ initData,
- /* freeData */ NULL,
- /* requiredDataMask */ NULL,
+ /* freeData */ freeData,
/* isDisabled */ NULL,
/* updateDepsgraph */ NULL,
/* dependsOnTime */ dependsOnTime,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
