[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17157] branches/soc-2008-unclezeiv/source /blender/render/intern/source/convertblender.c: Enabled baking for lightcuts.

Davide Vercelli davide.vercelli at gmail.com
Wed Oct 22 01:28:22 CEST 2008


Revision: 17157
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17157
Author:   unclezeiv
Date:     2008-10-22 01:28:22 +0200 (Wed, 22 Oct 2008)

Log Message:
-----------
Enabled baking for lightcuts. Thorough testing required.

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-10-21 23:14:40 UTC (rev 17156)
+++ branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c	2008-10-21 23:28:22 UTC (rev 17157)
@@ -5452,8 +5452,8 @@
 	if(!actob && ELEM4(type, RE_BAKE_LIGHT, RE_BAKE_NORMALS, RE_BAKE_TEXTURE, RE_BAKE_DISPLACEMENT)) {
 		re->r.mode &= ~R_SHADOW;
 		re->r.mode &= ~R_RAYTRACE;
+		re->r.mode &= ~R_LIGHTCUTS;
 	}
-	re->r.mode &= ~R_LIGHTCUTS;
 	
 	if(!actob && (type==RE_BAKE_SHADOW)) {
 		re->r.mode |= R_SHADOW;
@@ -5518,6 +5518,14 @@
 		if(re->wrld.ao_gather_method == WO_AOGATHER_APPROX)
 			if(re->r.mode & R_SHADOW)
 				make_occ_tree(re);
+	
+	/* lightcuts */
+	if((type == RE_BAKE_ALL) && (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;
+	}
 }
 
 /* ------------------------------------------------------------------------- */





More information about the Bf-blender-cvs mailing list