Skip to content

Transform your 3D texturing workflow with the power of generative AI, directly within Blender!

keep camera image displays off masked edit layers

sakalond0df05363718d
diff --git a/stablegen/cameras/images.py b/stablegen/cameras/images.py
index 4657001..4e33723 100644
--- a/stablegen/cameras/images.py
+++ b/stablegen/cameras/images.py
@@ -1,11 +1,26 @@
"""Read existing projection images without loading files or changing materials."""
import json
+import re
from pathlib import Path
import bpy
from ..texturing.view_plan import generation_cameras, order_cameras
+# Masked Edit output folders: '<timestamp>-masked-<hex>' (see masked_edit.SG_OT_MaskedEdit).
+_MASKED_RUN = re.compile(r'-masked-[0-9a-f]+$', re.IGNORECASE)
+
+
+def is_masked_edit_layer(node):
+ """A Masked Edit view layer reuses projection labels but is not a camera's generated image.
+
+ Masked Edit tags its layers; older files are recognised by the run folder holding the image.
+ """
+ if node.get('sg_masked_edit'):
+ return True
+ path = Path(bpy.path.abspath(node.image.filepath, library=node.image.library))
+ return any(_MASKED_RUN.search(part) for part in path.parts[:-1])
+
def images_from_manifest(cameras, textures, manifest):
"""Keep persisted source indices even when cameras are renamed or removed."""
@@ -55,6 +70,8 @@ def projected_images(context, *, objects=None, materials=None, manifests=None):
parts = node.label.split('-')
if len(parts) != 2 or not all(part.isdigit() for part in parts):
continue
+ if is_masked_edit_layer(node):
+ continue
index, version = map(int, parts)
if version > latest:
latest, textures = version, {}
diff --git a/stablegen/texturing/masked_edit.py b/stablegen/texturing/masked_edit.py
index 634df0d..866903c 100644
--- a/stablegen/texturing/masked_edit.py
+++ b/stablegen/texturing/masked_edit.py
@@ -908,6 +908,8 @@ def project_view(context, objects, camera, image_path, write_path, material_id,
weight = invert.inputs[1].links[0].from_socket
texture = _upstream_texture(mix.inputs['Color1'])
if texture is not None:
+ # Keeps camera image displays on the generated views, not this edit layer.
+ texture['sg_masked_edit'] = True
layers[obj.name] = {'mix': mix.name, 'texture': texture.name}
selected = selection_socket(material, obj.sg_edit_mask)
# With expansion enabled, the camera-space write mask defines the