[Bf-blender-cvs] [c6049d1] master: Fix T46194: Crash rendering particles
Campbell Barton
noreply at git.blender.org
Tue Sep 22 14:21:55 CEST 2015
Commit: c6049d137140e9e916fa206c4b3cd2d6a0d14154
Author: Campbell Barton
Date: Tue Sep 22 22:14:19 2015 +1000
Branches: master
https://developer.blender.org/rBc6049d137140e9e916fa206c4b3cd2d6a0d14154
Fix T46194: Crash rendering particles
Off by one error in 38940662
===================================================================
M source/blender/render/intern/source/renderdatabase.c
===================================================================
diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c
index d271592..7a9b2d0 100644
--- a/source/blender/render/intern/source/renderdatabase.c
+++ b/source/blender/render/intern/source/renderdatabase.c
@@ -1377,8 +1377,8 @@ ObjectInstanceRen *RE_addRenderInstance(Render *re, ObjectRen *obr, Object *ob,
obi->lay= lay;
/* Fill particle info */
- if (obi->psysindex >= 0) {
- int psysindex = 0;
+ if (obi->psysindex > 0) {
+ int psysindex = 1;
int index;
ParticleSystem *psys;
if (obi->par) {
More information about the Bf-blender-cvs
mailing list