[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53683] trunk/blender/source/blender/ render/intern/source/zbuf.c: Fix #33815: blender internal crash rendering material pass with strands.

[Brecht Van Lommel]

Revision: 53683
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53683
Author:   blendix
Date:     2013-01-09 15:39:26 +0000 (Wed, 09 Jan 2013)
Log Message:
-----------
Fix #33815: blender internal crash rendering material pass with strands.

Patch from Sergey with modifications.

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

Modified: trunk/blender/source/blender/render/intern/source/zbuf.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/zbuf.c	2013-01-09 13:46:59 UTC (rev 53682)
+++ trunk/blender/source/blender/render/intern/source/zbuf.c	2013-01-09 15:39:26 UTC (rev 53683)
@@ -4148,8 +4148,17 @@
 				}
 				if (addpassflag & SCE_PASS_INDEXMA) {
 					ObjectRen *obr = R.objectinstance[zrow[totface-1].obi].obr;
-					VlakRen *vr = obr->vlaknodes->vlak;
-					Material *mat = vr->mat;
+					Material *mat = NULL;
+
+					if (zrow[totface-1].segment == -1) {
+						if (obr->vlaknodes)
+							mat = obr->vlaknodes->vlak->mat;
+					}
+					else {
+						if (obr->strandbuf)
+							mat = obr->strandbuf->ma;
+					}
+
 					if (mat) {
 						for (a= 0; a<totfullsample; a++)
 							add_transp_material_index(rlpp[a], od, mat);