From c27a94849cc9c880b78d4306a239ab8bcdc89d0d Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Wed, 14 Oct 2009 14:45:58 +0000 Subject: [PATCH] * Fixes for Render Tab separation. * All Edges is now in the object mode "Display" Tab, as the option doesn't affect Edit Mode. Missing Redraw here... --- release/scripts/io/engine_render_pov.py | 18 +++++++++--------- release/scripts/io/netrender/ui.py | 12 ++++++------ release/scripts/ui/buttons_render.py | 12 +----------- release/scripts/ui/buttons_scene.py | 7 ++----- 4 files changed, 18 insertions(+), 31 deletions(-) diff --git a/release/scripts/io/engine_render_pov.py b/release/scripts/io/engine_render_pov.py index f0247ce532a..f69c8a267e0 100644 --- a/release/scripts/io/engine_render_pov.py +++ b/release/scripts/io/engine_render_pov.py @@ -826,12 +826,12 @@ class PovrayRender(bpy.types.RenderEngine): bpy.types.register(PovrayRender) # Use some of the existing buttons. -import buttons_scene -buttons_scene.SCENE_PT_render.COMPAT_ENGINES.add('POVRAY_RENDER') -buttons_scene.SCENE_PT_dimensions.COMPAT_ENGINES.add('POVRAY_RENDER') -buttons_scene.SCENE_PT_antialiasing.COMPAT_ENGINES.add('POVRAY_RENDER') -buttons_scene.SCENE_PT_output.COMPAT_ENGINES.add('POVRAY_RENDER') -del buttons_scene +import buttons_render +buttons_render.RENDER_PT_render.COMPAT_ENGINES.add('POVRAY_RENDER') +buttons_render.RENDER_PT_dimensions.COMPAT_ENGINES.add('POVRAY_RENDER') +buttons_render.RENDER_PT_antialiasing.COMPAT_ENGINES.add('POVRAY_RENDER') +buttons_render.RENDER_PT_output.COMPAT_ENGINES.add('POVRAY_RENDER') +del buttons_render # Use only a subset of the world panels import buttons_world @@ -852,14 +852,14 @@ del buttons_material class RenderButtonsPanel(bpy.types.Panel): __space_type__ = 'PROPERTIES' __region_type__ = 'WINDOW' - __context__ = "scene" + __context__ = "render" # COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here def poll(self, context): rd = context.scene.render_data return (rd.use_game_engine==False) and (rd.engine in self.COMPAT_ENGINES) -class SCENE_PT_povray_radiosity(RenderButtonsPanel): +class RENDER_PT_povray_radiosity(RenderButtonsPanel): __label__ = "Radiosity" COMPAT_ENGINES = set(['POVRAY_RENDER']) @@ -909,4 +909,4 @@ class SCENE_PT_povray_radiosity(RenderButtonsPanel): col = split.column() col.itemR(scene, "pov_radio_always_sample") -bpy.types.register(SCENE_PT_povray_radiosity) +bpy.types.register(RENDER_PT_povray_radiosity) diff --git a/release/scripts/io/netrender/ui.py b/release/scripts/io/netrender/ui.py index fba834ed9e0..638f46318af 100644 --- a/release/scripts/io/netrender/ui.py +++ b/release/scripts/io/netrender/ui.py @@ -20,7 +20,7 @@ ERROR = 3 class RenderButtonsPanel(bpy.types.Panel): __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" - __context__ = "scene" + __context__ = "render" # COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here def poll(self, context): @@ -29,7 +29,7 @@ class RenderButtonsPanel(bpy.types.Panel): # Setting panel, use in the scene for now. @rnaType -class SCENE_PT_network_settings(RenderButtonsPanel): +class RENDER_PT_network_settings(RenderButtonsPanel): __label__ = "Network Settings" COMPAT_ENGINES = set(['NET_RENDER']) @@ -60,7 +60,7 @@ class SCENE_PT_network_settings(RenderButtonsPanel): col.itemO("render.netclientscan", icon="ICON_FILE_REFRESH", text="") @rnaType -class SCENE_PT_network_job(RenderButtonsPanel): +class RENDER_PT_network_job(RenderButtonsPanel): __label__ = "Job Settings" COMPAT_ENGINES = set(['NET_RENDER']) @@ -88,7 +88,7 @@ class SCENE_PT_network_job(RenderButtonsPanel): col.itemR(scene.network_render, "chunks") @rnaType -class SCENE_PT_network_slaves(RenderButtonsPanel): +class RENDER_PT_network_slaves(RenderButtonsPanel): __label__ = "Slaves Status" COMPAT_ENGINES = set(['NET_RENDER']) @@ -126,7 +126,7 @@ class SCENE_PT_network_slaves(RenderButtonsPanel): layout.itemL(text="Stats: " + slave.stats) @rnaType -class SCENE_PT_network_slaves_blacklist(RenderButtonsPanel): +class RENDER_PT_network_slaves_blacklist(RenderButtonsPanel): __label__ = "Slaves Blacklist" COMPAT_ENGINES = set(['NET_RENDER']) @@ -163,7 +163,7 @@ class SCENE_PT_network_slaves_blacklist(RenderButtonsPanel): layout.itemL(text="Stats: " + time.ctime(slave.stats)) @rnaType -class SCENE_PT_network_jobs(RenderButtonsPanel): +class RENDER_PT_network_jobs(RenderButtonsPanel): __label__ = "Jobs" COMPAT_ENGINES = set(['NET_RENDER']) diff --git a/release/scripts/ui/buttons_render.py b/release/scripts/ui/buttons_render.py index a8f1b730ff7..379326510bf 100644 --- a/release/scripts/ui/buttons_render.py +++ b/release/scripts/ui/buttons_render.py @@ -1,14 +1,6 @@ import bpy -class SceneButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "render" - - def poll(self, context): - return (context.scene != None) - class RenderButtonsPanel(bpy.types.Panel): __space_type__ = 'PROPERTIES' __region_type__ = 'WINDOW' @@ -17,7 +9,7 @@ class RenderButtonsPanel(bpy.types.Panel): def poll(self, context): rd = context.scene.render_data - return (rd.use_game_engine==False) and (rd.engine in self.COMPAT_ENGINES) + return (context.scene and rd.use_game_engine==False) and (rd.engine in self.COMPAT_ENGINES) class RENDER_PT_render(RenderButtonsPanel): __label__ = "Render" @@ -446,7 +438,6 @@ class RENDER_PT_stamp(RenderButtonsPanel): sub.active = rd.stamp_note sub.itemR(rd, "stamp_note_text", text="") - bpy.types.register(RENDER_PT_render) bpy.types.register(RENDER_PT_layers) bpy.types.register(RENDER_PT_dimensions) @@ -457,4 +448,3 @@ bpy.types.register(RENDER_PT_encoding) bpy.types.register(RENDER_PT_performance) bpy.types.register(RENDER_PT_post_processing) bpy.types.register(RENDER_PT_stamp) - diff --git a/release/scripts/ui/buttons_scene.py b/release/scripts/ui/buttons_scene.py index 6c68e793852..964e06d017d 100644 --- a/release/scripts/ui/buttons_scene.py +++ b/release/scripts/ui/buttons_scene.py @@ -7,7 +7,7 @@ class SceneButtonsPanel(bpy.types.Panel): __context__ = "scene" def poll(self, context): - return (context.scene != None) + return context.scene class SCENE_PT_scene(SceneButtonsPanel): __label__ = "Scene" @@ -17,9 +17,9 @@ class SCENE_PT_scene(SceneButtonsPanel): layout = self.layout scene = context.scene + layout.itemR(scene, "camera") layout.itemR(scene, "set", text="Background") - class SCENE_PT_unit(SceneButtonsPanel): __label__ = "Units" @@ -119,9 +119,6 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel): col.itemR(ksp, "grouping") if ksp.grouping == 'NAMED': col.itemR(ksp, "group") - - - class SCENE_PT_physics(SceneButtonsPanel): __label__ = "Gravity"