diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-18 16:29:18 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-18 16:29:18 +0400 |
| commit | a08a3ab931f334dcaa3d32fe80d848e8dd1a315b (patch) | |
| tree | ebfabc34dc6414d3e6c7f65b664df2ea4ed8bf5a /source/blender/render | |
| parent | 9660ba6c2b1093470d189947286adda483b8faff (diff) | |
Fix #33916: 2.65a regression: particles duplicating objects with halo - crash
allow_render_dupli_instance used to pass zero-based index to give_current_material
which is wrong.
Before rev53332 it wasn't so much visible because give_current_material used
to clamp index internally. But that was wrong behavior here anyway, and why
nobody noticed this for so long? :)
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 6c5e558e6c7..05f5f248944 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4769,7 +4769,7 @@ static int allow_render_dupli_instance(Render *UNUSED(re), DupliObject *dob, Obj if (totmaterial) { for (a= 0; a<*totmaterial; a++) { - ma= give_current_material(obd, a); + ma= give_current_material(obd, a + 1); if (ma && (ma->material_type == MA_TYPE_HALO)) return 0; } |