[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29541] branches/render25/source/blender/ render/intern/source/shadeoutput.c: Render Branch: fix crash with strands & override materials.
Brecht Van Lommel
brecht at blender.org
Fri Jun 18 11:44:03 CEST 2010
Revision: 29541
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29541
Author: blendix
Date: 2010-06-18 11:44:02 +0200 (Fri, 18 Jun 2010)
Log Message:
-----------
Render Branch: fix crash with strands & override materials.
Modified Paths:
--------------
branches/render25/source/blender/render/intern/source/shadeoutput.c
Modified: branches/render25/source/blender/render/intern/source/shadeoutput.c
===================================================================
--- branches/render25/source/blender/render/intern/source/shadeoutput.c 2010-06-18 08:22:05 UTC (rev 29540)
+++ branches/render25/source/blender/render/intern/source/shadeoutput.c 2010-06-18 09:44:02 UTC (rev 29541)
@@ -426,7 +426,10 @@
normalize_v3(offset);
madd_v3_v3fl(co, offset, 1e-8f);
- copy_v3_v3(n, surfnor);
+ if(surfnor)
+ copy_v3_v3(n, surfnor);
+ else
+ zero_v3(n); /* this shouldn't happen, but with override materials can */
}
static void shade_lamp_accumulate(Render *re, LampRen *lar, ShadeInput *shi, ShadeResult *shr, float lv[3], float lainf[3], float lashdw[3], int passflag)
More information about the Bf-blender-cvs
mailing list