From fbbc0ecaf30b690fdfc5088d534f067bbbed8bbb Mon Sep 17 00:00:00 2001 From: pullusb Date: Mon, 22 Apr 2024 15:39:40 +0200 Subject: [PATCH] Remove default scene use restriction --- CHANGELOG.md | 4 ++++ OP_check_scene.py | 2 +- OP_post_render.py | 2 +- OP_render_scenes.py | 4 ++-- OP_setup_layers.py | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b993ea3..dd94e16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ Activate / deactivate layer opacity according to prefix Activate / deactivate all masks using MA layers --> +1.7.4 + +- removed: Restriction to use default scene "Scene" + 1.7.3 - added: Optional string templates for fileoutputs diff --git a/OP_check_scene.py b/OP_check_scene.py index 17ba1c0..4afb2ce 100644 --- a/OP_check_scene.py +++ b/OP_check_scene.py @@ -59,7 +59,7 @@ def check_file_output_numbering(reports=None): prenum = re.compile(r'\d{3}_') file_outs = [] for S in bpy.data.scenes: - if S.name == 'Scene' or not S.node_tree or not S.use_nodes: + if not S.node_tree or not S.use_nodes: # S.name == 'Scene' or continue file_outs += [n for n in S.node_tree.nodes if n.type == 'OUTPUT_FILE'] diff --git a/OP_post_render.py b/OP_post_render.py index 5099b59..8618778 100644 --- a/OP_post_render.py +++ b/OP_post_render.py @@ -28,7 +28,7 @@ def renumber_sequence_on_disk_from_file_slots(apply=True, active_scene_only=Fals # multi scene check: file_outs = [] for S in bpy.data.scenes: - if S.name == 'Scene' or not S.node_tree or not S.use_nodes: + if not S.node_tree or not S.use_nodes: # S.name == 'Scene' or continue file_outs += [n for n in S.node_tree.nodes if n.type == 'OUTPUT_FILE' and n.name.startswith('OUT_') and not n.mute] diff --git a/OP_render_scenes.py b/OP_render_scenes.py index 830f0c9..4ddb864 100644 --- a/OP_render_scenes.py +++ b/OP_render_scenes.py @@ -22,8 +22,8 @@ class GPEXP_OT_render_all_scenes(bpy.types.Operator): start = time() ct = 0 for scn in bpy.data.scenes: - if scn.name == 'Scene': - continue + # if scn.name == 'Scene': + # continue if not scn.use_nodes: continue outfiles = [n for n in scn.node_tree.nodes if n.type == 'OUTPUT_FILE'] diff --git a/OP_setup_layers.py b/OP_setup_layers.py index 8404ae6..417a7ff 100644 --- a/OP_setup_layers.py +++ b/OP_setup_layers.py @@ -20,8 +20,8 @@ def check_outname(ob, l): ng_name = f'NG_{ob.name}' ## check in wich node tree this exists for scn in bpy.data.scenes: - if scn.name == 'Scene': - continue + # if scn.name == 'Scene': + # continue ng = scn.node_tree.nodes.get(ng_name) if ng: break