Fix indirect + ao bake

Naxela · Mar 9, 2022 · ae1b910 · ae1b910
1 parent ad51429
commit ae1b910
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/addon/utility/build.py b/addon/utility/build.py
@@ -30,7 +30,20 @@ def prepare_build(self=0, background_mode=False, shutdown_after_build=False):
 
     print("Building lightmaps")
 
-    if bpy.context.scene.TLM_EngineProperties.tlm_lighting_mode == "combinedao":
+    if bpy.context.scene.TLM_EngineProperties.tlm_lighting_mode == "combinedao": 
+
+        scene = bpy.context.scene
+
+        if not "tlm_plus_mode" in bpy.app.driver_namespace or bpy.app.driver_namespace["tlm_plus_mode"] == 0:
+            filepath = bpy.data.filepath
+            dirpath = os.path.join(os.path.dirname(bpy.data.filepath), scene.TLM_EngineProperties.tlm_lightmap_savedir)
+            if os.path.isdir(dirpath):
+                for file in os.listdir(dirpath):
+                    os.remove(os.path.join(dirpath + "/" + file))
+            bpy.app.driver_namespace["tlm_plus_mode"] = 1
+            print("Plus Mode")
+
+    if bpy.context.scene.TLM_EngineProperties.tlm_lighting_mode == "indirectao": 
 
         scene = bpy.context.scene
 

diff --git a/addon/utility/cycles/lightmap.py b/addon/utility/cycles/lightmap.py
@@ -137,8 +137,10 @@ def bake(plus_pass=0):
                     print("IndirAO")
 
                     if bpy.app.driver_namespace["tlm_plus_mode"] == 1:
-                        bpy.ops.object.bake(type="DIFFUSE", pass_filter={"DIRECT","INDIRECT"}, margin=scene.TLM_EngineProperties.tlm_dilation_margin, use_clear=False)
+                        print("IndirAO: 1")
+                        bpy.ops.object.bake(type="DIFFUSE", pass_filter={"INDIRECT"}, margin=scene.TLM_EngineProperties.tlm_dilation_margin, use_clear=False)
                     elif bpy.app.driver_namespace["tlm_plus_mode"] == 2:
+                        print("IndirAO: 2")
                         bpy.ops.object.bake(type="AO", margin=scene.TLM_EngineProperties.tlm_dilation_margin, use_clear=False)
 
                 elif scene.TLM_EngineProperties.tlm_lighting_mode == "complete":