Make baked outside nodes behave more consistently

Author: ucupumar

Bake.py

@@ -1673,6 +1673,7 @@ def execute(self, context):
         # Process baked images
         baked_images = []
         for i, ch in enumerate(self.channels):
+            if ch.no_layer_using: continue
 
             baked = tree.nodes.get(ch.baked)
             if baked and baked.image:
@@ -3103,7 +3104,7 @@ def update_enable_baked_outside(self, context):
                     mtree.links.new(tex.outputs[0], norm.inputs[1])
 
                     baked_normal_overlay = None
-                    if not is_overlay_normal_empty(yp):
+                    if is_baked_normal_without_bump_needed(ch):
                         baked_normal_overlay = tree.nodes.get(ch.baked_normal_overlay)
                         if baked_normal_overlay and baked_normal_overlay.image:
                             loc_y -= 300
@@ -3117,10 +3118,10 @@ def update_enable_baked_outside(self, context):
                             if not is_bl_newer_than(2, 80) and baked_normal_overlay.image.colorspace_settings.name != get_srgb_name():
                                 tex_normal_overlay.color_space = 'NONE'
 
+                            # Displacement setup will use normal without bump if it exists
                             if ch.enable_subdiv_setup:
                                 mtree.links.new(tex_normal_overlay.outputs[0], norm.inputs[1])
 
-                    #if not ch.enable_subdiv_setup or baked_normal_overlay:
                     for l in outp.links:
                         mtree.links.new(norm.outputs[0], l.to_socket)
 

bake_common.py

@@ -1644,6 +1644,14 @@ def get_valid_filepath(img, use_hdr):
 
     return img.filepath
 
+def is_baked_normal_without_bump_needed(root_ch):
+    yp = root_ch.id_data.yp
+
+    return (
+        (not is_overlay_normal_empty(yp) and (any_layers_using_disp(yp) or any_layers_using_vdisp(yp))) or
+        (root_ch.enable_subdiv_setup and (any_layers_using_disp(yp) or any_layers_using_vdisp(yp)))
+    )
+
 def bake_channel(
         uv_map, mat, node, root_ch, width=1024, height=1024, target_layer=None, use_hdr=False, 
         aa_level=1, force_use_udim=False, tilenums=[], interpolation='Linear', 
@@ -1942,8 +1950,8 @@ def bake_channel(
 
         if not target_layer:
 
-            ### Normal overlay only
-            if (is_overlay_normal_empty(yp) or (not any_layers_using_disp(yp) and not any_layers_using_vdisp(yp))) and not root_ch.enable_subdiv_setup:
+            ### Normal without bump only
+            if not is_baked_normal_without_bump_needed(root_ch):
                 # Remove baked_normal_overlay
                 remove_node(tree, root_ch, 'baked_normal_overlay')
             else:
@@ -2025,7 +2033,7 @@ def bake_channel(
                 if end_linear:
                     create_link(tree, ori_soc, end.inputs[root_ch.name])
 
-                # Set baked normal overlay image
+                # Set baked normal without bump image
                 if baked_normal_overlay.image:
                     temp = baked_normal_overlay.image
                     img_users = get_all_image_users(baked_normal_overlay.image)

common.py

@@ -5513,7 +5513,7 @@ def is_any_layer_using_channel(root_ch, node=None):
 
     for layer in yp.layers:
         if layer.type in {'GROUP', 'BACKGROUND'}: continue
-        if layer.channels[ch_idx].enable:
+        if get_channel_enabled(layer.channels[ch_idx], layer):
             return True
 
     return False
@@ -5964,7 +5964,7 @@ def is_overlay_normal_empty(yp):
 
     for l in yp.layers:
         c = get_height_channel(l)
-        if not c or not l.enable or not c.enable: continue
+        if not c or not get_channel_enabled(c, l): continue
         if c.normal_map_type == 'NORMAL_MAP' or (c.normal_map_type == 'BUMP_MAP' and not c.write_height):
             return False
 
@@ -5974,7 +5974,7 @@ def any_layers_using_vdisp(yp):
 
     for l in yp.layers:
         c = get_height_channel(l)
-        if not c or not l.enable or not c.enable: continue
+        if not c or not get_channel_enabled(c, l): continue
         if c.normal_map_type == 'VECTOR_DISPLACEMENT_MAP':
             return True
 
@@ -5985,7 +5985,7 @@ def any_layers_using_disp(yp):
     for l in yp.layers:
         if l.type in {'GROUP', 'BACKGROUND'}: continue
         c = get_height_channel(l)
-        if not c or not l.enable or not c.enable: continue
+        if not c or not get_channel_enabled(c, l): continue
         if c.normal_map_type in {'BUMP_MAP', 'BUMP_NORMAL_MAP'} and c.write_height:
             return True
 

ui.py

@@ -4544,7 +4544,7 @@ def draw_item(self, context, layout, data, item, icon, active_data, active_propn
         icon_value = lib.get_icon(lib.channel_custom_icon_dict[item.type])
         row.prop(item, 'name', text='', emboss=False, icon_value=icon_value)
 
-        if not yp.use_baked or item.no_layer_using:
+        if not yp.use_baked or (item.no_layer_using and not (yp.use_baked and yp.enable_baked_outside)):
             if item.type == 'RGB':
                 row = row.row(align=True)