[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51974] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: fix for own error in recent orig-index refactor (reported as [#33112])
Campbell Barton
ideasman42 at gmail.com
Wed Nov 7 12:37:57 CET 2012
Revision: 51974
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51974
Author: campbellbarton
Date: 2012-11-07 11:37:53 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
fix for own error in recent orig-index refactor (reported as [#33112])
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/particle_system.c
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-11-07 11:32:57 UTC (rev 51973)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-11-07 11:37:53 UTC (rev 51974)
@@ -367,11 +367,12 @@
nodedmelem= MEM_callocN(sizeof(LinkNode)*totdmelem, "psys node elems");
nodearray= MEM_callocN(sizeof(LinkNode *)*totelem, "psys node array");
- for (i=0, node=nodedmelem; i<totdmelem; i++, origindex++, node++) {
+ for (i=0, node=nodedmelem; i<totdmelem; i++, node++) {
int origindex_final;
node->link = SET_INT_IN_POINTER(i);
- origindex_final = *origindex;
+ /* may be vertex or face origindex */
+ origindex_final = origindex ? origindex[i] : ORIGINDEX_NONE;
/* if we have a poly source, do an index lookup */
if (origindex_poly && origindex_final != ORIGINDEX_NONE) {
More information about the Bf-blender-cvs
mailing list