Transform your 3D texturing workflow with the power of generative AI, directly within Blender!
reproject the generation under a masked edit
sakalond032adc58e5cf
diff --git a/stablegen/texturing/generator.py b/stablegen/texturing/generator.pyindex 80a94b4..f6b0566 100644--- a/stablegen/texturing/generator.py+++ b/stablegen/texturing/generator.py@@ -219,7 +219,7 @@ class Reproject(bpy.types.Operator):# Search for largest material idmax_id = -1for obj in to_texture:- mat_id = get_last_material_index(obj)+ mat_id = get_last_material_index(obj, include_edits=False)if mat_id > max_id:max_id = mat_id@@ -1125,9 +1125,11 @@ class ComfyUIGenerate(_PBRMixin, bpy.types.Operator):self._to_texture = [obj for obj in bpy.context.view_layer.objects if obj.type == 'MESH' and not obj.hide_get()]# Find all mesh objects, check their material ids and store the highest one+ # (a reprojection reads generated views, which Masked Edit layers do not have)+ reproject = context.scene.generation_mode == 'project_only'for obj in self._to_texture:for slot in obj.material_slots:- material_id = get_last_material_index(obj)+ material_id = get_last_material_index(obj, include_edits=not reproject)if (material_id > self._material_id):self._material_id = material_id# Check if there's room for the projection buffer UV map (only 1 slot needed)diff --git a/stablegen/utils.py b/stablegen/utils.pyindex 9769907..095e0d8 100644--- a/stablegen/utils.py+++ b/stablegen/utils.py@@ -236,19 +236,25 @@ class CurvesToMesh(bpy.types.Operator):self.report({'INFO'}, "All curves converted to meshes.")return {'FINISHED'}-def get_last_material_index(obj):- """Read projection IDs, never infer them from active shader arithmetic."""+def get_last_material_index(obj, include_edits=True):+ """Read projection IDs, never infer them from active shader arithmetic.++ Without *include_edits*, Masked Edit layers do not count: they hold one edited view, not a+ generated image per camera, so reprojecting must read the generation underneath them."""highest_index = -1for mat in getattr(obj.data, 'materials', ()):if not mat or not mat.use_nodes:continueindices = []legacy = []+ edit_ids, image_ids = set(), set()for node in mat.node_tree.nodes:if node.type == 'TEX_IMAGE':# Existing .blend files label projected images camera-material.parts = node.label.split('-')if len(parts) == 2 and all(part.isdigit() for part in parts):+ if not include_edits:+ (edit_ids if node.get('sg_masked_edit') else image_ids).add(int(parts[1]))indices.append(int(parts[1]))if node.type == 'MATH' and node.operation == 'SUBTRACT':value = float(node.inputs[0].default_value)@@ -260,6 +266,10 @@ def get_last_material_index(obj):and not any(socket.is_linked for socket in node.outputs)):# Old versions stored the ID in an unlabeled, detached node.legacy.append(int(value))+ if not include_edits:+ # An edit layer also has its own SGMaterialIndex node; drop the IDs only edits use.+ edit_only = edit_ids - image_ids+ indices = [i for i in indices if i not in edit_only]if indices or legacy:highest_index = max(highest_index, max(indices or legacy))return highest_index