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:
authorCampbell Barton <ideasman42@gmail.com>2015-09-22 15:14:19 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-09-22 15:16:40 +0300
commitc6049d137140e9e916fa206c4b3cd2d6a0d14154 (patch)
treea40f84a6ebd82ccacd46dd6050f73358ea43bac1 /source/blender/render/intern
parenta1e2b292bb9f84092b55d9e7a003d232b525d782 (diff)
Fix T46194: Crash rendering particles
Off by one error in 38940662
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r--source/blender/render/intern/source/renderdatabase.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c
index d271592af5f..7a9b2d0903e 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) {