Skip to content

Fix adaptive Subdivision UI for Blender 5.0 Compatibility #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deepdeliberate wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix adaptive Subdivision UI for Blender 5.0 Compatibility #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 27 additions & 13 deletions modules/ui/properties_data_modifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,16 +1214,30 @@ def SUBSURF(self, layout, ob, md):

scene = context.scene
engine = context.engine
show_adaptive_options = (
engine == 'CYCLES' and md == ob.modifiers[-1]
and scene.cycles.feature_set == 'EXPERIMENTAL' and md.use_limit_surface
)
show_adaptive_options = False

if BLENDER_VERSION_MAJOR_POINT_MINOR >= 5.0:
# Blender 5.0 has only Scene dicing rate, and adaptive_src gives source for modifier in Blender 5.0 +
ob_dicing_rate = 1.0
adaptive_src = md
show_adaptive_options = (
engine == 'CYCLES'
and md.use_limit_surface and( BLENDER_VERSION_MAJOR_POINT_MINOR >= 5.0 or scene.cycles.feature_set == 'EXPERIMENTAL')
)

else:
ob_dicing_rate = ob.cycles.dicing_rate
adaptive_src = ob.cycles
show_adaptive_options = (
engine == 'CYCLES' and md == ob.modifiers[-1]
and scene.cycles.feature_set == 'EXPERIMENTAL' and md.use_limit_surface
)

if show_adaptive_options:
col.label(text="Render:")
col.prop(ob.cycles, "use_adaptive_subdivision", text="Adaptive")
if ob.cycles.use_adaptive_subdivision:
col.prop(ob.cycles, "dicing_rate")
col.prop(adaptive_src, "use_adaptive_subdivision", text="Adaptive")
if adaptive_src.use_adaptive_subdivision:
col.prop(adaptive_src, "dicing_rate")
else:
col.prop(md, "render_levels", text="Levels")

Expand All @@ -1240,13 +1254,13 @@ def SUBSURF(self, layout, ob, md):
sub.prop(md, "levels", text="Viewport")

sub = col.column()
sub.active = (not show_adaptive_options) or (not ob.cycles.use_adaptive_subdivision)
sub.active = (not show_adaptive_options) or (not adaptive_src.use_adaptive_subdivision)
sub.prop(md, "quality")

col = split.column()

sub = col.column()
sub.active = (not show_adaptive_options) or (not ob.cycles.use_adaptive_subdivision)
sub.active = (not show_adaptive_options) or (not adaptive_src.use_adaptive_subdivision)
sub.label(text="UV Smooth:")
sub.prop(md, "uv_smooth", text="")
sub.label(text="Boundary Smooth:")
Expand All @@ -1255,20 +1269,20 @@ def SUBSURF(self, layout, ob, md):
col.prop(md, "show_only_control_edges")

sub = col.column()
sub.active = (not show_adaptive_options) or (not ob.cycles.use_adaptive_subdivision)
sub.active = (not show_adaptive_options) or (not adaptive_src.use_adaptive_subdivision)
sub.prop(md, "use_limit_surface")
sub.prop(md, "use_creases")
sub.prop(md, "use_custom_normals")

if show_adaptive_options and ob.cycles.use_adaptive_subdivision:
if show_adaptive_options and adaptive_src.use_adaptive_subdivision:
col = layout.column(align=True)
col.scale_y = 0.6
col.separator()
col.label(text="Final Dicing Rate:")
col.separator()

render = max(scene.cycles.dicing_rate * ob.cycles.dicing_rate, 0.1)
preview = max(scene.cycles.preview_dicing_rate * ob.cycles.dicing_rate, 0.1)
render = max(scene.cycles.dicing_rate * ob_dicing_rate, 0.1)
preview = max(scene.cycles.preview_dicing_rate * ob_dicing_rate, 0.1)
col.label(text=f"Render {render:.2f} px, Preview {preview:.2f} px")

def SURFACE(self, layout, _ob, _md):
Expand Down