[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41613] trunk/blender/release/scripts/ startup/bl_ui: 2.6 UI:

[Thomas Dinges]

Revision: 41613
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41613
Author:   dingto
Date:     2011-11-07 14:34:56 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
2.6 UI:
* Minor tweaks after tomato merge, rest of Tomato UI code is excellent. :) 

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
    trunk/blender/release/scripts/startup/bl_ui/properties_scene.py

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py	2011-11-07 13:25:17 UTC (rev 41612)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py	2011-11-07 14:34:56 UTC (rev 41613)
@@ -761,8 +761,7 @@
 
         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")
 

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_scene.py	2011-11-07 13:25:17 UTC (rev 41612)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_scene.py	2011-11-07 14:34:56 UTC (rev 41613)
@@ -42,6 +42,7 @@
 
         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 @@
         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"