Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2014-07-18 13:53:35 +0400
committerLukas Tönne <lukas.toenne@gmail.com>2014-07-18 13:53:35 +0400
commitb98448918160f05feb725c29a9c6b7c2cf4257f8 (patch)
tree21c6203db8c61ca0817b00a239ba365cb99c0b1f
parentcf3bb40c625716ea083ee453e5263cc9e759ee18 (diff)
Fix T41114: Particle systems cause memory corruption due to invalid
dmcache index (again).
-rw-r--r--source/blender/blenkernel/intern/particle_system.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 06ac9db0b16..5237eeda108 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];