[Bf-blender-cvs] [f5872d2] master: Fix T47531: crash with particle roughness curve mapping, after fix for T46382.

Brecht Van Lommel noreply at git.blender.org
Tue Feb 23 04:24:42 CET 2016


Commit: f5872d2747b8caef60a0b6201524a2c5b7fb029e
Author: Brecht Van Lommel
Date:   Tue Feb 23 04:22:13 2016 +0100
Branches: master
https://developer.blender.org/rBf5872d2747b8caef60a0b6201524a2c5b7fb029e

Fix T47531: crash with particle roughness curve mapping, after fix for T46382.

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

M	source/blender/blenkernel/intern/particle.c

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

diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index bc30917..d02308b 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -2113,7 +2113,7 @@ static bool psys_thread_context_init_path(ParticleThreadContext *ctx, ParticleSi
 		ctx->clumpcurve = NULL;
 	}
 	if ((part->child_flag & PART_CHILD_USE_ROUGH_CURVE) && part->roughcurve) {
-		ctx->clumpcurve = curvemapping_copy(part->roughcurve);
+		ctx->roughcurve = curvemapping_copy(part->roughcurve);
 		curvemapping_changed_all(ctx->roughcurve);
 	}
 	else {




More information about the Bf-blender-cvs mailing list