[Bf-blender-cvs] [96c0aeb] blender-v2.76-release: Fix T46194: Crash rendering particles
Campbell Barton
noreply at git.blender.org
Wed Sep 23 16:12:17 CEST 2015
Commit: 96c0aebeaeb6faf6f285e7e4b7f043ffdcd0f8ec
Author: Campbell Barton
Date: Tue Sep 22 22:14:19 2015 +1000
Branches: blender-v2.76-release
https://developer.blender.org/rB96c0aebeaeb6faf6f285e7e4b7f043ffdcd0f8ec
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