Commit: b98448918160f05feb725c29a9c6b7c2cf4257f8
Author: Lukas Tönne
Date: Fri Jul 18 11:53:35 2014 +0200
https://developer.blender.org/rBb98448918160f05feb725c29a9c6b7c2cf4257f8
Fix T41114: Particle systems cause memory corruption due to invalid
dmcache index (again).
===================================================================
M source/blender/blenkernel/intern/particle_system.c
===================================================================
diff --git a/source/blender/blenkernel/intern/particle_system.c
b/source/blender/blenkernel/intern/particle_system.c
index 06ac9db..5237eed 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -399,7 +399,7 @@ void psys_calc_dmcache(Object *ob, DerivedMesh *dm,
ParticleSystem *psys)
}
}
- if (origindex_final != ORIGINDEX_NONE) {
+ if (origindex_final != ORIGINDEX_NONE &&
origindex_final < totelem) {
if (nodearray[origindex_final]) {
/* prepend */
node->next = nodearray[origindex_final];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
