diff options
author | Ines Almeida <britalmeida@gmail.com> | 2015-01-15 12:47:02 +0300 |
---|---|---|
committer | Ines Almeida <britalmeida@gmail.com> | 2015-01-15 12:47:02 +0300 |
commit | 588656a568a837d3d043c91b684ebbe2a006b2af (patch) | |
tree | 31e520e4db5805e0052e8a891c9be03ea2f88e8b /release/scripts/startup/bl_ui | |
parent | 1ec44b22e9137845465fe0db493a6c4263fc49ae (diff) |
Review for the gsoc UI cleanup for the BGE
Review for the gsoc UI cleanup for the BGE.
Surviving commits are:
- Game Engine UI cleanup: removing Scene/Active Clip
- Game Engine UI cleanup: Adding missing 'not available' labels in empty panels
The rest was reverted for being subjective and polluting the UI code with an if for every button:
http://wiki.blender.org/index.php/User:Brita/GSoC_BGE_cleanup_and_support/reports/final#UI_Review
Reviewers: kupoman
Subscribers: dingto
Projects: #game_ui
Differential Revision: https://developer.blender.org/D982
Diffstat (limited to 'release/scripts/startup/bl_ui')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render_layer.py | 6 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_scene.py | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py b/release/scripts/startup/bl_ui/properties_render_layer.py index 2494e49d812..554eef8f0f1 100644 --- a/release/scripts/startup/bl_ui/properties_render_layer.py +++ b/release/scripts/startup/bl_ui/properties_render_layer.py @@ -48,7 +48,7 @@ class RENDERLAYER_UL_renderlayers(UIList): class RENDERLAYER_PT_layers(RenderLayerButtonsPanel, Panel): bl_label = "Layer List" bl_options = {'HIDE_HEADER'} - COMPAT_ENGINES = {'BLENDER_RENDER'} + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): layout = self.layout @@ -56,6 +56,10 @@ class RENDERLAYER_PT_layers(RenderLayerButtonsPanel, Panel): scene = context.scene rd = scene.render + if rd.engine == 'BLENDER_GAME': + layout.label("Not available in the Game Engine") + return + row = layout.row() col = row.column() col.template_list("RENDERLAYER_UL_renderlayers", "", rd, "layers", rd.layers, "active_index", rows=2) diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 049161fdce8..d172596d51f 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -62,7 +62,8 @@ class SCENE_PT_scene(SceneButtonsPanel, Panel): layout.prop(scene, "camera") layout.prop(scene, "background_set", text="Background") - layout.prop(scene, "active_clip", text="Active Clip") + if context.scene.render.engine != 'BLENDER_GAME': + layout.prop(scene, "active_clip", text="Active Clip") class SCENE_PT_unit(SceneButtonsPanel, Panel): |