[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15646] branches/soc-2008-unclezeiv/source /blender/render/intern/source/convertblender.c: Check that shadowing and raytracing are enabled before initializing lightcuts (Blender could crash abruptly otherwise).

Davide Vercelli davide.vercelli at gmail.com
Sat Jul 19 20:55:51 CEST 2008


Revision: 15646
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15646
Author:   unclezeiv
Date:     2008-07-19 20:54:53 +0200 (Sat, 19 Jul 2008)

Log Message:
-----------
Check that shadowing and raytracing are enabled before initializing lightcuts (Blender could crash abruptly otherwise). Also check that Blender Internal is being used. No user feedback though (suggestions are welcome).

Modified Paths:
--------------
    branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c

Modified: branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c
===================================================================
--- branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c	2008-07-19 15:44:00 UTC (rev 15645)
+++ branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c	2008-07-19 18:54:53 UTC (rev 15646)
@@ -4973,8 +4973,12 @@
 				make_sss_tree(re);
 		
 		/* lightcuts */
-		if((re->r.mode & R_LIGHTCUTS) && !re->test_break())
-			lightcuts_init(re);
+		if((re->r.mode & R_LIGHTCUTS) && !re->test_break()) {
+			if ((re->r.mode & R_RAYTRACE) && (re->r.mode & R_SHADOW) && (re->r.renderer==R_INTERN))
+				lightcuts_init(re);
+			else
+				re->r.mode &= ~R_LIGHTCUTS;
+		}
 	}
 	
 	if(re->test_break())





More information about the Bf-blender-cvs mailing list