[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56075] trunk/blender/source/blender/ render/intern/source/render_result.c: Fix crash rendering environment maps.

Brecht Van Lommel brechtvanlommel at pandora.be
Tue Apr 16 01:12:52 CEST 2013


Revision: 56075
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56075
Author:   blendix
Date:     2013-04-15 23:12:52 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
Fix crash rendering environment maps.

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

Modified: trunk/blender/source/blender/render/intern/source/render_result.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/render_result.c	2013-04-15 23:12:49 UTC (rev 56074)
+++ trunk/blender/source/blender/render/intern/source/render_result.c	2013-04-15 23:12:52 UTC (rev 56075)
@@ -539,6 +539,7 @@
 		if (srl->passflag  & SCE_PASS_TRANSM_COLOR)
 			render_layer_add_pass(rr, rl, 3, SCE_PASS_TRANSM_COLOR);
 		
+		BKE_freestyle_config_init(&srl->freestyleConfig);
 	}
 	/* sss, previewrender and envmap don't do layers, so we make a default one */
 	if (rr->layers.first == NULL && !(layername && layername[0])) {
@@ -565,7 +566,6 @@
 		rl->lay = (1 << 20) - 1;
 		rl->layflag = 0x7FFF;    /* solid ztra halo strand */
 		rl->passflag = SCE_PASS_COMBINED;
-		BKE_freestyle_config_init(&srl->freestyleConfig);
 		
 		re->r.actlay = 0;
 	}




More information about the Bf-blender-cvs mailing list