diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-11-07 15:37:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-07 15:37:53 +0400 |
| commit | 14dea2c5bfba710bca4137b4e1b0cbf232cb8058 (patch) | |
| tree | 2e61ab82ab8c80e829e31c1ead654038ec8d188a /source/blender/blenkernel/intern/particle_system.c | |
| parent | 73d83fd99be63b4e38f5b741ea24ab9a5f914f84 (diff) | |
fix for own error in recent orig-index refactor (reported as [#33112])
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 2b95946f571..5e1e51883f0 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -367,11 +367,12 @@ void psys_calc_dmcache(Object *ob, DerivedMesh *dm, ParticleSystem *psys) 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) { |