[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58140] trunk/blender/source/blender/ blenkernel/intern/particle.c: fix [#36079] Use Modifier Stack Crash with Particles
Campbell Barton
ideasman42 at gmail.com
Wed Jul 10 07:46:45 CEST 2013
Revision: 58140
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58140
Author: campbellbarton
Date: 2013-07-10 05:46:45 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
fix [#36079] Use Modifier Stack Crash with Particles
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/particle.c
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2013-07-10 05:38:36 UTC (rev 58139)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2013-07-10 05:46:45 UTC (rev 58140)
@@ -3414,8 +3414,7 @@
OrigSpaceFace *osface;
float (*orcodata)[3];
- int i = pa->num_dmcache == DMCACHE_NOTFOUND ? pa->num : pa->num_dmcache;
-
+ int i = (ELEM(pa->num_dmcache, DMCACHE_ISCHILD, DMCACHE_NOTFOUND)) ? pa->num : pa->num_dmcache;
if (i == -1 || i >= dm->getNumTessFaces(dm)) { unit_m4(mat); return; }
mface = dm->getTessFaceData(dm, i, CD_MFACE);
More information about the Bf-blender-cvs
mailing list