diff options
author | Thomas Dinges <blender@dingto.org> | 2011-11-07 18:34:56 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2011-11-07 18:34:56 +0400 |
commit | 5ebee683bd736ef80df939552bbe0d8e104b56df (patch) | |
tree | 9ba973a80459970df5d8edf0b89dc4b7ad9b31d2 | |
parent | 2b6e4f242230d99470ef70c7c00f1809a098d200 (diff) |
2.6 UI:
* Minor tweaks after tomato merge, rest of Tomato UI code is excellent. :)
-rw-r--r-- | release/scripts/startup/bl_ui/properties_object_constraint.py | 3 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_scene.py | 11 |
2 files changed, 2 insertions, 12 deletions
diff --git a/release/scripts/startup/bl_ui/properties_object_constraint.py b/release/scripts/startup/bl_ui/properties_object_constraint.py index 4def354741e..c493124c5bb 100644 --- a/release/scripts/startup/bl_ui/properties_object_constraint.py +++ b/release/scripts/startup/bl_ui/properties_object_constraint.py @@ -761,8 +761,7 @@ class ConstraintButtonsPanel(): layout.prop(con, "track") - row = layout.row() - row.prop(con, "reference", expand=True) + layout.row().prop(con, "reference", expand=True) layout.operator("clip.constraint_to_fcurve") diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 6e28c8b42f1..86880b9ddec 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -42,6 +42,7 @@ 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") class SCENE_PT_audio(SceneButtonsPanel, Panel): @@ -218,16 +219,6 @@ class SCENE_PT_simplify(SceneButtonsPanel, Panel): col.prop(rd, "simplify_ao_sss", text="AO and SSS") -class SCENE_PT_movie_clip(SceneButtonsPanel, Panel): - bl_label = "Movie Clip" - - def draw(self, context): - layout = self.layout - scene = context.scene - - layout.prop(scene, "active_clip", text="Active Clip") - - class SCENE_PT_custom_props(SceneButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} _context_path = "scene" |