svn merge ^/trunk/blender -r50010:50095

2 files changed, 8 insertions, 0 deletions

diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c
index 9eb360f6819..95f6ef60665 100644
--- a/source/blender/modifiers/intern/MOD_warp.c
+++ b/source/blender/modifiers/intern/MOD_warp.c
@@ -195,6 +195,10 @@ static void warpModifier_do(WarpModifierData *wmd, Object *ob,
 	if (wmd->curfalloff == NULL) /* should never happen, but bad lib linking could cause it */
 		wmd->curfalloff = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
 
+	if (wmd->curfalloff) {
+		curvemapping_initialize(wmd->curfalloff);
+	}
+
 	invert_m4_m4(obinv, ob->obmat);
 
 	mult_m4_m4m4(mat_from, obinv, wmd->object_from->obmat);
diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.c b/source/blender/modifiers/intern/MOD_weightvg_util.c
index 81cdad0d5e5..7181b5bbb44 100644
--- a/source/blender/modifiers/intern/MOD_weightvg_util.c
+++ b/source/blender/modifiers/intern/MOD_weightvg_util.c
@@ -73,6 +73,10 @@ void weightvg_do_map(int num, float *new_w, short falloff_type, CurveMapping *cm
 		return;
 	}
 
+	if (cmap && falloff_type == MOD_WVG_MAPPING_CURVE) {
+		curvemapping_initialize(cmap);
+	}
+
 	/* Map each weight (vertex) to its new value, accordingly to the chosen mode. */
 	for (i = 0; i < num; ++i) {
 		float fac = new_w[i];