[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53893] trunk/blender/source/blender/ render/intern/source/convertblender.c: Fix #33916: 2.65a regression: particles duplicating objects with halo - crash

[Sergey Sharybin]

Revision: 53893
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53893
Author:   nazgul
Date:     2013-01-18 12:29:18 +0000 (Fri, 18 Jan 2013)
Log Message:
-----------
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? :)

Revision Links:
--------------
    
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53332

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/convertblender.c

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c  
2013-01-18 09:36:17 UTC (rev 53892)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c  
2013-01-18 12:29:18 UTC (rev 53893)
@@ -4769,7 +4769,7 @@
 
        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;
                }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs