diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-10-28 23:07:00 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-10-28 23:08:55 +0300 |
commit | bc8c44ea7abb9478896f311078e07eca8da461e6 (patch) | |
tree | 163c0dedbee731a7e6707bf39b8dd5c3112e1cb5 /amaranth | |
parent | 90a42907818ecf4010731043d3008c8355774cb8 (diff) |
Fix T92334: Amaranth errors after cycles-x changes
Diffstat (limited to 'amaranth')
-rw-r--r-- | amaranth/render/samples_scene.py | 98 | ||||
-rwxr-xr-x | amaranth/scene/debug.py | 44 |
2 files changed, 10 insertions, 132 deletions
diff --git a/amaranth/render/samples_scene.py b/amaranth/render/samples_scene.py index 44f3361f..0409a771 100644 --- a/amaranth/render/samples_scene.py +++ b/amaranth/render/samples_scene.py @@ -34,66 +34,6 @@ from bpy.props import ( ) -class AMTH_RENDER_OT_cycles_samples_percentage_set(bpy.types.Operator): - - """Save the current number of samples per shader as final (gets saved in .blend)""" - bl_idname = "scene.amaranth_cycles_samples_percentage_set" - bl_label = "Set as Render Samples" - - def execute(self, context): - cycles = context.scene.cycles - cycles.use_samples_final = True - - context.scene["amth_cycles_samples_final"] = [ - cycles.diffuse_samples, - cycles.glossy_samples, - cycles.transmission_samples, - cycles.ao_samples, - cycles.mesh_light_samples, - cycles.subsurface_samples, - cycles.volume_samples] - - self.report({"INFO"}, "Render Samples Saved") - - return {"FINISHED"} - - -class AMTH_RENDER_OT_cycles_samples_percentage(bpy.types.Operator): - - """Set a percentage of the final render samples""" - bl_idname = "scene.amaranth_cycles_samples_percentage" - bl_label = "Set Render Samples Percentage" - - percent: IntProperty( - name="Percentage", - description="Percentage to divide render samples by", - subtype="PERCENTAGE", default=0 - ) - - def execute(self, context): - percent = self.percent - cycles = context.scene.cycles - cycles_samples_final = context.scene["amth_cycles_samples_final"] - - cycles.use_samples_final = False - - if percent == 100: - cycles.use_samples_final = True - - cycles.diffuse_samples = int((cycles_samples_final[0] / 100) * percent) - cycles.glossy_samples = int((cycles_samples_final[1] / 100) * percent) - cycles.transmission_samples = int( - (cycles_samples_final[2] / 100) * percent) - cycles.ao_samples = int((cycles_samples_final[3] / 100) * percent) - cycles.mesh_light_samples = int( - (cycles_samples_final[4] / 100) * percent) - cycles.subsurface_samples = int( - (cycles_samples_final[5] / 100) * percent) - cycles.volume_samples = int((cycles_samples_final[6] / 100) * percent) - - return {"FINISHED"} - - def render_cycles_scene_samples(self, context): layout = self.layout @@ -103,36 +43,6 @@ def render_cycles_scene_samples(self, context): cscene = scene.cycles list_sampling = scene.amaranth_cycles_list_sampling - # Set Render Samples - if utils.cycles_exists() and cscene.progressive == "BRANCHED_PATH": - layout.separator() - split = layout.split() - col = split.column() - - col.operator( - AMTH_RENDER_OT_cycles_samples_percentage_set.bl_idname, - text="%s" % - "Set as Render Samples" if cscene.use_samples_final else "Set New Render Samples", - icon="%s" % - "PINNED" if cscene.use_samples_final else "UNPINNED") - - col = split.column() - row = col.row(align=True) - row.enabled = True if scene.get("amth_cycles_samples_final") else False - - row.operator( - AMTH_RENDER_OT_cycles_samples_percentage.bl_idname, - text="100%").percent = 100 - row.operator( - AMTH_RENDER_OT_cycles_samples_percentage.bl_idname, - text="75%").percent = 75 - row.operator( - AMTH_RENDER_OT_cycles_samples_percentage.bl_idname, - text="50%").percent = 50 - row.operator( - AMTH_RENDER_OT_cycles_samples_percentage.bl_idname, - text="25%").percent = 25 - # List Samples #if (len(scene.render.layers) > 1) or (len(bpy.data.scenes) > 1): if (len(scene.render.views) > 1) or (len(bpy.data.scenes) > 1): @@ -163,14 +73,14 @@ def render_cycles_scene_samples(self, context): row.prop( rl, "samples", text="%s" % "Samples" if rl.samples > 0 else "Automatic (%s)" % - (cscene.aa_samples if cscene.progressive == "BRANCHED_PATH" else cscene.samples)) + cscene.samples) if (len(bpy.data.scenes) > 1): col.separator() col.label(text="Scenes:", icon="SCENE_DATA") - if utils.cycles_exists() and cscene.progressive == "PATH": + if utils.cycles_exists(): for s in bpy.data.scenes: if s != scene: row = col.row(align=True) @@ -224,15 +134,11 @@ def clear(): def register(): init() - bpy.utils.register_class(AMTH_RENDER_OT_cycles_samples_percentage) - bpy.utils.register_class(AMTH_RENDER_OT_cycles_samples_percentage_set) if utils.cycles_exists(): bpy.types.CYCLES_RENDER_PT_sampling.append(render_cycles_scene_samples) def unregister(): - bpy.utils.unregister_class(AMTH_RENDER_OT_cycles_samples_percentage) - bpy.utils.unregister_class(AMTH_RENDER_OT_cycles_samples_percentage_set) if utils.cycles_exists(): bpy.types.CYCLES_RENDER_PT_sampling.remove(render_cycles_scene_samples) diff --git a/amaranth/scene/debug.py b/amaranth/scene/debug.py index c4962b5d..6d9486be 100755 --- a/amaranth/scene/debug.py +++ b/amaranth/scene/debug.py @@ -1147,12 +1147,9 @@ class AMTH_PT_LightersCorner(Panel): col.label(text="Name/Library link") - if engine in ["CYCLES", "BLENDER_RENDER"]: - splits = 0.6 if engine == "BLENDER_RENDER" else 0.4 + if engine in ["CYCLES"]: + splits = 0.4 splita = split.split(factor=splits, align=True) - col = splita.column(align=True) - col.alignment = "LEFT" - col.label(text="Samples") if utils.cycles_exists() and engine == "CYCLES": col = splita.column(align=True) @@ -1226,9 +1223,8 @@ class AMTH_UL_LightersCorner_UI(UIList): emboss=False, icon="LINK_BLEND").filepath = is_library rows = split.row(align=True) - splits = 0.9 if engine == "BLENDER_RENDER" else 0.4 + splits = 0.4 splitlamp = rows.split(factor=splits, align=True) - splitlampb = splitlamp.row(align=True) splitlampc = splitlamp.row(align=True) splitlampd = rows.row(align=True) splitlampd.alignment = "RIGHT" @@ -1236,10 +1232,6 @@ class AMTH_UL_LightersCorner_UI(UIList): if utils.cycles_exists() and engine == "CYCLES": if "LIGHT" in icon_type: clamp = ob.data.cycles - if context.scene.cycles.progressive == "BRANCHED_PATH": - splitlampb.prop(clamp, "samples", text="") - if context.scene.cycles.progressive == "PATH": - splitlampb.label(text="N/A") lamp = ob.data if lamp.type in ["POINT", "SUN", "SPOT"]: splitlampc.label(text="{:.2f}".format(lamp.shadow_soft_size)) @@ -1251,33 +1243,13 @@ class AMTH_UL_LightersCorner_UI(UIList): ) else: splitlampc.label(text="{:.2f}".format(lamp.size)) - else: - splitlampb.label(text="N/A") - if engine == "BLENDER_RENDER": - if "LIGHT" in icon_type: - lamp = ob.data - if lamp.type == "HEMI": - splitlampb.label(text="Not Available") - elif lamp.type == "AREA" and lamp.shadow_method == "RAY_SHADOW": - splitlampb.prop(lamp, "shadow_ray_samples_x", text="X") - if lamp.shape == "RECTANGLE": - splitlampb.prop(lamp, "shadow_ray_samples_y", text="Y") - elif lamp.shadow_method == "RAY_SHADOW": - splitlampb.prop(lamp, "shadow_ray_samples", text="Ray Samples") - elif lamp.shadow_method == "BUFFER_SHADOW": - splitlampb.prop(lamp, "shadow_buffer_samples", text="Buffer Samples") - else: - splitlampb.label(text="No Shadow") - else: - splitlampb.label(text="N/A") if utils.cycles_exists(): - visibility = ob.cycles_visibility - splitlampd.prop(visibility, "camera", text="") - splitlampd.prop(visibility, "diffuse", text="") - splitlampd.prop(visibility, "glossy", text="") - splitlampd.prop(visibility, "shadow", text="") + splitlampd.prop(ob, "visible_camera", text="") + splitlampd.prop(ob, "visible_diffuse", text="") + splitlampd.prop(ob, "visible_glossy", text="") + splitlampd.prop(ob, "visible_shadow", text="") splitlampd.separator() - splitlampd.prop(ob, "hide", text="", emboss=False) + splitlampd.prop(ob, "hide_viewport", text="", emboss=False) splitlampd.prop(ob, "hide_render", text="", emboss=False) splitlampd.operator( AMTH_SCENE_OT_amaranth_object_select.bl_idname, |