Skip to content

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

add more guidance map options for qwen

sakalond3dafcbe26b5d
diff --git a/.gitignore b/.gitignore
index 0a19790..04f7719 100644
--- a/.gitignore
+++ b/.gitignore
@@ -172,3 +172,4 @@ cython_debug/
# PyPI configuration file
.pypirc
+stablegen/feather.oso
diff --git a/stablegen/__init__.py b/stablegen/__init__.py
index ea9e91b..62926fe 100644
--- a/stablegen/__init__.py
+++ b/stablegen/__init__.py
@@ -1803,7 +1803,9 @@ def register():
description="The type of guidance map to use for Qwen Image Edit",
items=[
('depth', 'Depth Map', 'Use depth map for structural guidance'),
- ('normal', 'Normal Map', 'Use normal map for structural guidance')
+ ('normal', 'Normal Map', 'Use normal map for structural guidance'),
+ ('workbench', 'Workbench Render', 'Use workbench render for structural guidance'),
+ ('viewport', 'Viewport Render', 'Use viewport render (OpenGL) for structural guidance')
],
default='depth',
update=update_parameters
diff --git a/stablegen/generator.py b/stablegen/generator.py
index 19f6af1..ead17b9 100644
--- a/stablegen/generator.py
+++ b/stablegen/generator.py
@@ -17,7 +17,7 @@ import colorsys
from PIL import Image, ImageEnhance
from .util.helpers import prompt_text, prompt_text_img2img, prompt_text_qwen_image_edit # pylint: disable=relative-beyond-top-level
-from .render_tools import export_emit_image, export_visibility, export_canny, bake_texture, prepare_baking, unwrap # pylint: disable=relative-beyond-top-level
+from .render_tools import export_emit_image, export_visibility, export_canny, bake_texture, prepare_baking, unwrap, export_render, export_viewport # pylint: disable=relative-beyond-top-level
from .utils import get_last_material_index, get_generation_dirs, get_file_path, get_dir_path, remove_empty_dirs # pylint: disable=relative-beyond-top-level
from .project import project_image, reinstate_compare_nodes # pylint: disable=relative-beyond-top-level
from .workflows import WorkflowManager
@@ -575,7 +575,7 @@ class ComfyUIGenerate(bpy.types.Operator):
self._cameras.append(camera)
bpy.context.scene.collection.objects.link(camera)
- if context.scene.generation_mode == 'standard':
+ if context.scene.generation_mode == 'standard' or context.scene.generation_mode == 'regenerate_selected':
# If there is depth controlnet unit
if any(unit["unit_type"] == "depth" for unit in controlnet_units) or (context.scene.use_flux_lora and context.scene.model_architecture == 'flux1') or (context.scene.model_architecture == 'qwen_image_edit' and context.scene.qwen_guidance_map_type == 'depth') or (context.scene.model_architecture.startswith('qwen') and context.scene.qwen_generation_method == 'refine' and context.scene.qwen_refine_use_depth):
if context.scene.generation_method != 'uv_inpaint':
@@ -604,6 +604,30 @@ class ComfyUIGenerate(bpy.types.Operator):
if context.scene.generation_method == 'grid':
self.combine_maps(context, self._cameras, type="normal")
+ # If Qwen guidance using Workbench
+ if context.scene.model_architecture == 'qwen_image_edit' and context.scene.qwen_guidance_map_type == 'workbench':
+ if context.scene.generation_method != 'uv_inpaint':
+ # Export workbench render for each camera
+ # We need to target the directory that get_file_path(..., subtype="workbench") expects
+ workbench_dir = get_dir_path(context, "controlnet")["workbench"]
+ for i, camera in enumerate(self._cameras):
+ bpy.context.scene.camera = camera
+ # Filename logic must match get_file_path: "render{camera_id}" -> "render{camera_id}0001.png"
+ export_render(context, camera_id=i, output_dir=workbench_dir, filename=f"render{i}")
+ if context.scene.generation_method == 'grid':
+ self.combine_maps(context, self._cameras, type="workbench")
+ # If Qwen guidance using Viewport
+ elif context.scene.model_architecture == 'qwen_image_edit' and context.scene.qwen_guidance_map_type == 'viewport':
+ if context.scene.generation_method != 'uv_inpaint':
+ # Export viewport render for each camera
+ viewport_dir = get_dir_path(context, "controlnet")["viewport"]
+ for i, camera in enumerate(self._cameras):
+ bpy.context.scene.camera = camera
+ # Filename logic must match get_file_path: "viewport{camera_id}.png"
+ export_viewport(context, camera_id=i, output_dir=viewport_dir, filename=f"viewport{i}")
+ if context.scene.generation_method == 'grid':
+ self.combine_maps(context, self._cameras, type="viewport")
+
# Prepare for generating
if context.scene.generation_method == 'grid':
self._threads_left = 1
@@ -1418,6 +1442,10 @@ class ComfyUIGenerate(bpy.types.Operator):
grid_image_path = get_file_path(context, "controlnet", subtype="canny", camera_id=None, material_id=self._material_id)
elif type == 'normal':
grid_image_path = get_file_path(context, "controlnet", subtype="normal", camera_id=None, material_id=self._material_id)
+ elif type == 'workbench':
+ grid_image_path = get_file_path(context, "controlnet", subtype="workbench", camera_id=None, material_id=self._material_id)
+ elif type == 'viewport':
+ grid_image_path = get_file_path(context, "controlnet", subtype="viewport", camera_id=None, material_id=self._material_id)
# Render depth maps for each camera and combine them into a grid
depth_maps = []
@@ -1429,6 +1457,10 @@ class ComfyUIGenerate(bpy.types.Operator):
depth_map_path = get_file_path(context, "controlnet", subtype="canny", camera_id=i, material_id=self._material_id)
elif type == 'normal':
depth_map_path = get_file_path(context, "controlnet", subtype="normal", camera_id=i, material_id=self._material_id)
+ elif type == 'workbench':
+ depth_map_path = get_file_path(context, "controlnet", subtype="workbench", camera_id=i, material_id=self._material_id)
+ elif type == 'viewport':
+ depth_map_path = get_file_path(context, "controlnet", subtype="viewport", camera_id=i, material_id=self._material_id)
depth_maps.append(depth_map_path)
# Combine depth maps into a grid
diff --git a/stablegen/render_tools.py b/stablegen/render_tools.py
index c2e3e00..12d5b80 100644
--- a/stablegen/render_tools.py
+++ b/stablegen/render_tools.py
@@ -550,12 +550,14 @@ def export_emit_image(context, to_export, camera_id=None, bg_color=(0.5, 0.5, 0.
print(f"Emmision render saved to: {os.path.join(output_dir, output_file)}.png")
-def export_render(context, camera_id=None):
+def export_render(context, camera_id=None, output_dir=None, filename=None):
"""
Renders the scene from a camera's perspective using Workbench.
Creates temporary materials for consistent rendering.
:param context: Blender context.
:param camera_id: ID of the camera for the output filename.
+ :param output_dir: Optional output directory.
+ :param filename: Optional filename (without component/frame suffix).
:return: None
"""
print("Exporting render using Workbench")
@@ -594,8 +596,13 @@ def export_render(context, camera_id=None):
context.scene.frame_set(1)
# Setup output path
- output_dir = get_dir_path(context, "misc")
- output_file = f"render{camera_id}" if camera_id is not None else "render"
+ if output_dir is None:
+ output_dir = get_dir_path(context, "misc")
+
+ if filename is None:
+ output_file = f"render{camera_id}" if camera_id is not None else "render"
+ else:
+ output_file = filename
# Store original render settings
original_engine = context.scene.render.engine
@@ -603,6 +610,8 @@ def export_render(context, camera_id=None):
'lighting': context.scene.display.shading.light,
'color_type': context.scene.display.shading.color_type
}
+ original_render_filepath = context.scene.render.filepath
+ original_image_settings = context.scene.render.image_settings.file_format
# Switch to WORKBENCH render engine and configure settings
context.scene.render.engine = 'BLENDER_WORKBENCH'
@@ -655,10 +664,106 @@ def export_render(context, camera_id=None):
context.scene.render.engine = original_engine
context.scene.display.shading.light = original_workbench_settings['lighting']
context.scene.display.shading.color_type = original_workbench_settings['color_type']
+ context.scene.render.filepath = original_render_filepath
+ context.scene.render.image_settings.file_format = original_image_settings
print(f"Render saved to: {os.path.join(output_dir, output_file)}0001.png") # Blender adds frame number
+
+def export_viewport(context, camera_id=None, output_dir=None, filename=None):
+ """
+ Renders the scene using viewport OpenGL render to include overlays.
+ :param context: Blender context.
+ :param camera_id: ID of the camera for the output filename.
+ :param output_dir: Optional output directory.
+ :param filename: Optional filename (without component/frame suffix).
+ :return: None
+ """
+ print("Exporting render using Viewport (OpenGL)")
+
+ # Setup output path
+ if output_dir is None:
+ output_dir = get_dir_path(context, "misc")
+
+ if filename is None:
+ output_file = f"render{camera_id}" if camera_id is not None else "render"
+ else:
+ output_file = filename
+
+ # Store original render settings
+ original_engine = context.scene.render.engine
+ original_render_filepath = context.scene.render.filepath
+ original_image_settings = context.scene.render.image_settings.file_format
+
+ # Switch to WORKBENCH render engine for consistent viewport shading
+ context.scene.render.engine = 'BLENDER_WORKBENCH'
+
+ # Find a viewport
+ viewport_area = None
+ viewport_region = None
+ viewport_space = None
+ viewport_region_3d = None
+ viewport_window = None
+
+ for window in context.window_manager.windows:
+ for area in window.screen.areas:
+ if area.type == 'VIEW_3D':
+ viewport_area = area
+ viewport_window = window
+ for region in area.regions:
+ if region.type == 'WINDOW':
+ viewport_region = region
+ break
+ viewport_space = area.spaces.active
+ viewport_region_3d = viewport_space.region_3d if viewport_space else None
+ break
+ if viewport_area:
+ break
+
+ if not (viewport_area and viewport_region and viewport_space and viewport_region_3d and viewport_window):
+ print("Viewport render failed: no VIEW_3D area found.")
+ context.scene.render.engine = original_engine
+ return
+
+ # Store viewport settings
+ original_view_perspective = viewport_region_3d.view_perspective
+ original_shading_type = viewport_space.shading.type
+ original_overlay_show = viewport_space.overlay.show_overlays
+
+ # Configure viewport for camera render with overlays
+ viewport_region_3d.view_perspective = 'CAMERA'
+ viewport_space.shading.type = 'RENDERED'
+ viewport_space.overlay.show_overlays = True
+
+ # Configure output filepath
+ context.scene.render.filepath = os.path.join(output_dir, f"{output_file}.png")
+ context.scene.render.image_settings.file_format = 'PNG'
+
+ override = {
+ 'window': viewport_window,
+ 'screen': viewport_window.screen,
+ 'area': viewport_area,
+ 'region': viewport_region,
+ 'scene': context.scene,
+ 'space_data': viewport_space,
+ 'region_data': viewport_region_3d,
+ }
+ with bpy.context.temp_override(**override):
+ bpy.ops.render.opengl(write_still=True, view_context=True)
+
+ # Restore viewport settings
+ viewport_region_3d.view_perspective = original_view_perspective
+ viewport_space.shading.type = original_shading_type
+ viewport_space.overlay.show_overlays = original_overlay_show
+
+ # Restore original render settings
+ context.scene.render.engine = original_engine
+ context.scene.render.filepath = original_render_filepath
+ context.scene.render.image_settings.file_format = original_image_settings
+
+ print(f"Viewport render saved to: {os.path.join(output_dir, output_file)}.png")
+
def export_canny(context, camera_id=None, low_threshold=0, high_threshold=80):
"""
Uses export_render and openCV to generate a Canny edge detection image.
diff --git a/stablegen/utils.py b/stablegen/utils.py
index c18703a..4ab8e09 100644
--- a/stablegen/utils.py
+++ b/stablegen/utils.py
@@ -237,6 +237,8 @@ def get_generation_dirs(context):
"depth": os.path.join(revision_dir, "controlnet", "depth"),
"canny": os.path.join(revision_dir, "controlnet", "canny"),
"normal": os.path.join(revision_dir, "controlnet", "normal"),
+ "workbench": os.path.join(revision_dir, "controlnet", "workbench"),
+ "viewport": os.path.join(revision_dir, "controlnet", "viewport"),
},
"generated": os.path.join(revision_dir, "generated"),
"generated_baked": os.path.join(revision_dir, "generated_baked"),
@@ -306,6 +308,10 @@ def get_file_path(context, file_type, subtype=None, filename=None, camera_id=Non
filename = f"canny{camera_id}0001" if camera_id is not None else "canny_grid"
elif subtype == "normal":
filename = f"normal_map{camera_id}0001" if camera_id is not None else "normal_grid"
+ elif subtype == "workbench":
+ filename = f"render{camera_id}0001" if camera_id is not None else "render_grid"
+ elif subtype == "viewport":
+ filename = f"viewport{camera_id}" if camera_id is not None else "viewport_grid"
return os.path.join(base_dir, f"{filename}.png")
elif file_type == "generated":