[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11208] trunk/blender/source/blender/src/ renderwin.c: Fix regression reported by Early Ehlinger on ML.

Diego Borghetti (Plumiferos) bdiego at gmail.com
Tue Jul 10 17:24:48 CEST 2007


Revision: 11208
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11208
Author:   bdiego
Date:     2007-07-10 17:24:48 +0200 (Tue, 10 Jul 2007)

Log Message:
-----------
Fix regression reported by Early Ehlinger on ML.
Original bug:
	https://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=3760

Code remove in revision 6654:
	http://projects.blender.org/plugins/scmsvn/viewcvs.php/trunk/blender/source/blender/src/renderwin.c?root=bf-blender&r1=6491&r2=6654

and return in revision 6839 (without the point checking):
	http://projects.blender.org/plugins/scmsvn/viewcvs.php/trunk/blender/source/blender/src/renderwin.c?root=bf-blender&r1=6835&r2=6839

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=6654
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=6839

Modified Paths:
--------------
    trunk/blender/source/blender/src/renderwin.c

Modified: trunk/blender/source/blender/src/renderwin.c
===================================================================
--- trunk/blender/source/blender/src/renderwin.c	2007-07-10 15:10:32 UTC (rev 11207)
+++ trunk/blender/source/blender/src/renderwin.c	2007-07-10 15:24:48 UTC (rev 11208)
@@ -1081,11 +1081,14 @@
 
 	/* allow localview render for objects with lights in normal layers */
 	if(curarea->spacetype==SPACE_VIEW3D) {
-		if(G.vd->lay & 0xFF000000) {
-			G.scene->lay |= G.vd->lay;
-			G.scene->r.scemode |= R_SINGLE_LAYER;
+		/* if view is defined (might not be if called from script), check and set layers. */
+		if(G.vd) {
+			if(G.vd->lay & 0xFF000000) {
+				G.scene->lay |= G.vd->lay;
+				G.scene->r.scemode |= R_SINGLE_LAYER;
+			}
+			else G.scene->lay= G.vd->lay;
 		}
-		else G.scene->lay= G.vd->lay;
 	}
 	
 	if(anim)





More information about the Bf-blender-cvs mailing list