[Bf-blender-cvs] [4dc141f] master: Yet another fix for crashing particles.

Lukas Tönne noreply at git.blender.org
Wed Mar 25 20:09:06 CET 2015


Commit: 4dc141f933f632ea00482b294e8c252ac12d21aa
Author: Lukas Tönne
Date:   Wed Mar 25 20:08:12 2015 +0100
Branches: master
https://developer.blender.org/rB4dc141f933f632ea00482b294e8c252ac12d21aa

Yet another fix for crashing particles.

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

M	source/blender/editors/space_view3d/drawobject.c

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

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index d4d8db6..808408b 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -52,6 +52,7 @@
 #include "BKE_anim.h"  /* for the where_on_path function */
 #include "BKE_armature.h"
 #include "BKE_camera.h"
+#include "BKE_colortools.h"
 #include "BKE_constraint.h"  /* for the get_constraint_target function */
 #include "BKE_curve.h"
 #include "BKE_DerivedMesh.h"
@@ -4762,6 +4763,12 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 	if (draw_as == PART_DRAW_NOT)
 		return;
 
+	/* prepare curvemapping tables */
+	if ((psys->part->child_flag & PART_CHILD_USE_CLUMP_CURVE) && psys->part->clumpcurve)
+		curvemapping_changed_all(psys->part->clumpcurve);
+	if ((psys->part->child_flag & PART_CHILD_USE_ROUGH_CURVE) && psys->part->roughcurve)
+		curvemapping_changed_all(psys->part->roughcurve);
+
 /* 2. */
 	sim.scene = scene;
 	sim.ob = ob;




More information about the Bf-blender-cvs mailing list