diff options
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 32 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 91 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_scene.py | 91 |
3 files changed, 107 insertions, 107 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index aa6d497b997..fe0735cfe7d 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -1909,9 +1909,9 @@ class CYCLES_RENDER_PT_debug(CyclesButtonsPanel, Panel): col.prop(cscene, "debug_bvh_type") -class CYCLES_SCENE_PT_simplify(CyclesButtonsPanel, Panel): +class CYCLES_RENDER_PT_simplify(CyclesButtonsPanel, Panel): bl_label = "Simplify" - bl_context = "scene" + bl_context = "render" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'CYCLES'} @@ -1923,10 +1923,10 @@ class CYCLES_SCENE_PT_simplify(CyclesButtonsPanel, Panel): pass -class CYCLES_SCENE_PT_simplify_viewport(CyclesButtonsPanel, Panel): +class CYCLES_RENDER_PT_simplify_viewport(CyclesButtonsPanel, Panel): bl_label = "Viewport" - bl_context = "scene" - bl_parent_id = "CYCLES_SCENE_PT_simplify" + bl_context = "render" + bl_parent_id = "CYCLES_RENDER_PT_simplify" COMPAT_ENGINES = {'CYCLES'} def draw(self, context): @@ -1947,10 +1947,10 @@ class CYCLES_SCENE_PT_simplify_viewport(CyclesButtonsPanel, Panel): col.prop(cscene, "ao_bounces", text="AO Bounces") -class CYCLES_SCENE_PT_simplify_render(CyclesButtonsPanel, Panel): +class CYCLES_RENDER_PT_simplify_render(CyclesButtonsPanel, Panel): bl_label = "Render" - bl_context = "scene" - bl_parent_id = "CYCLES_SCENE_PT_simplify" + bl_context = "render" + bl_parent_id = "CYCLES_RENDER_PT_simplify" COMPAT_ENGINES = {'CYCLES'} def draw(self, context): @@ -1972,10 +1972,10 @@ class CYCLES_SCENE_PT_simplify_render(CyclesButtonsPanel, Panel): col.prop(cscene, "ao_bounces_render", text="AO Bounces") -class CYCLES_SCENE_PT_simplify_culling(CyclesButtonsPanel, Panel): +class CYCLES_RENDER_PT_simplify_culling(CyclesButtonsPanel, Panel): bl_label = "Culling" - bl_context = "scene" - bl_parent_id = "CYCLES_SCENE_PT_simplify" + bl_context = "render" + bl_parent_id = "CYCLES_RENDER_PT_simplify" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'CYCLES'} @@ -2042,7 +2042,7 @@ def get_panels(): 'VIEWLAYER_PT_filter', 'VIEWLAYER_PT_layer_passes', 'RENDER_PT_post_processing', - 'SCENE_PT_simplify', + 'RENDER_PT_simplify', } panels = [] @@ -2118,10 +2118,10 @@ classes = ( CYCLES_MATERIAL_PT_settings_volume, CYCLES_RENDER_PT_bake, CYCLES_RENDER_PT_debug, - CYCLES_SCENE_PT_simplify, - CYCLES_SCENE_PT_simplify_viewport, - CYCLES_SCENE_PT_simplify_render, - CYCLES_SCENE_PT_simplify_culling, + CYCLES_RENDER_PT_simplify, + CYCLES_RENDER_PT_simplify_viewport, + CYCLES_RENDER_PT_simplify_render, + CYCLES_RENDER_PT_simplify_culling, ) diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 1594fc9b896..56022477515 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -580,6 +580,93 @@ class RENDER_PT_opengl_options(RenderButtonsPanel, Panel): VIEW3D_PT_shading_options.draw(self, context) +class RENDER_PT_simplify(RenderButtonsPanel, Panel): + bl_label = "Simplify" + bl_options = {'DEFAULT_CLOSED'} + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL'} + + def draw_header(self, context): + rd = context.scene.render + self.layout.prop(rd, "use_simplify", text="") + + def draw(self, context): + pass + + +class RENDER_PT_simplify_viewport(RenderButtonsPanel, Panel): + bl_label = "Viewport" + bl_parent_id = "RENDER_PT_simplify" + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL'} + + def draw(self, context): + layout = self.layout + layout.use_property_split = True + + rd = context.scene.render + + layout.active = rd.use_simplify + + flow = layout.grid_flow(row_major=True, columns=0, even_columns=False, even_rows=False, align=True) + + col = flow.column() + col.prop(rd, "simplify_subdivision", text="Max Subdivision") + + col = flow.column() + col.prop(rd, "simplify_child_particles", text="Max Child Particles") + + +class RENDER_PT_simplify_render(RenderButtonsPanel, Panel): + bl_label = "Render" + bl_parent_id = "RENDER_PT_simplify" + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL'} + + def draw(self, context): + layout = self.layout + layout.use_property_split = True + + rd = context.scene.render + + layout.active = rd.use_simplify + + flow = layout.grid_flow(row_major=True, columns=0, even_columns=False, even_rows=False, align=True) + + col = flow.column() + col.prop(rd, "simplify_subdivision_render", text="Max Subdivision") + + col = flow.column() + col.prop(rd, "simplify_child_particles_render", text="Max Child Particles") + + +class RENDER_PT_simplify_greasepencil(RenderButtonsPanel, Panel): + bl_label = "Grease Pencil" + bl_parent_id = "RENDER_PT_simplify" + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME', 'BLENDER_CLAY', 'BLENDER_EEVEE'} + bl_options = {'DEFAULT_CLOSED'} + + def draw_header(self, context): + rd = context.scene.render + self.layout.prop(rd, "simplify_gpencil", text="") + + def draw(self, context): + layout = self.layout + layout.use_property_split = True + + rd = context.scene.render + + layout.active = rd.simplify_gpencil + + col = layout.column() + col.prop(rd, "simplify_gpencil_onplay", text="Playback Only") + col.prop(rd, "simplify_gpencil_view_modifier", text="Modifiers") + col.prop(rd, "simplify_gpencil_shader_fx", text="ShaderFX") + + col = layout.column(align=True) + col.prop(rd, "simplify_gpencil_view_fill") + sub = col.column() + sub.active = rd.simplify_gpencil_view_fill + sub.prop(rd, "simplify_gpencil_remove_lines", text="Lines") + + classes = ( RENDER_PT_context, RENDER_PT_eevee_sampling, @@ -603,6 +690,10 @@ classes = ( RENDER_PT_opengl_film, RENDER_PT_color_management, RENDER_PT_color_management_curves, + RENDER_PT_simplify, + RENDER_PT_simplify_viewport, + RENDER_PT_simplify_render, + RENDER_PT_simplify_greasepencil, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index c7c735fe19c..1a6417d4075 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -451,93 +451,6 @@ class SCENE_PT_rigid_body_field_weights(SceneButtonsPanel, Panel): effector_weights_ui(self, context, rbw.effector_weights, 'RIGID_BODY') -class SCENE_PT_simplify(SceneButtonsPanel, Panel): - bl_label = "Simplify" - bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL'} - - def draw_header(self, context): - rd = context.scene.render - self.layout.prop(rd, "use_simplify", text="") - - def draw(self, context): - pass - - -class SCENE_PT_simplify_viewport(SceneButtonsPanel, Panel): - bl_label = "Viewport" - bl_parent_id = "SCENE_PT_simplify" - COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL'} - - def draw(self, context): - layout = self.layout - layout.use_property_split = True - - rd = context.scene.render - - layout.active = rd.use_simplify - - flow = layout.grid_flow(row_major=True, columns=0, even_columns=False, even_rows=False, align=True) - - col = flow.column() - col.prop(rd, "simplify_subdivision", text="Max Subdivision") - - col = flow.column() - col.prop(rd, "simplify_child_particles", text="Max Child Particles") - - -class SCENE_PT_simplify_render(SceneButtonsPanel, Panel): - bl_label = "Render" - bl_parent_id = "SCENE_PT_simplify" - COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL'} - - def draw(self, context): - layout = self.layout - layout.use_property_split = True - - rd = context.scene.render - - layout.active = rd.use_simplify - - flow = layout.grid_flow(row_major=True, columns=0, even_columns=False, even_rows=False, align=True) - - col = flow.column() - col.prop(rd, "simplify_subdivision_render", text="Max Subdivision") - - col = flow.column() - col.prop(rd, "simplify_child_particles_render", text="Max Child Particles") - - -class SCENE_PT_simplify_greasepencil(SceneButtonsPanel, Panel): - bl_label = "Grease Pencil" - bl_parent_id = "SCENE_PT_simplify" - COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME', 'BLENDER_CLAY', 'BLENDER_EEVEE'} - bl_options = {'DEFAULT_CLOSED'} - - def draw_header(self, context): - rd = context.scene.render - self.layout.prop(rd, "simplify_gpencil", text="") - - def draw(self, context): - layout = self.layout - layout.use_property_split = True - - rd = context.scene.render - - layout.active = rd.simplify_gpencil - - col = layout.column() - col.prop(rd, "simplify_gpencil_onplay", text="Playback Only") - col.prop(rd, "simplify_gpencil_view_modifier", text="Modifiers") - col.prop(rd, "simplify_gpencil_shader_fx", text="ShaderFX") - - col = layout.column(align=True) - col.prop(rd, "simplify_gpencil_view_fill") - sub = col.column() - sub.active = rd.simplify_gpencil_view_fill - sub.prop(rd, "simplify_gpencil_remove_lines", text="Lines") - - class SCENE_PT_custom_props(SceneButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL'} _context_path = "scene" @@ -548,10 +461,6 @@ classes = ( SCENE_UL_keying_set_paths, SCENE_PT_scene, SCENE_PT_unit, - SCENE_PT_simplify, - SCENE_PT_simplify_viewport, - SCENE_PT_simplify_render, - SCENE_PT_simplify_greasepencil, SCENE_PT_physics, SCENE_PT_keying_sets, SCENE_PT_keying_set_paths, |