[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28454] trunk/blender/release/scripts/ui/ space_view3d.py: Fix [#22165] "Camera:" field of the Properties>View panel (3D View) has no function & is confusing

[Matt Ebb]

Revision: 28454
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28454
Author:   broken
Date:     2010-04-27 08:47:12 +0200 (Tue, 27 Apr 2010)

Log Message:
-----------
Fix [#22165] "Camera:" field of the Properties>View panel (3D View) has no function & is confusing

Cleaned up UI, made it a bit clearer

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_view3d.py

Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py	2010-04-27 03:14:40 UTC (rev 28453)
+++ trunk/blender/release/scripts/ui/space_view3d.py	2010-04-27 06:47:12 UTC (rev 28454)
@@ -1848,8 +1848,6 @@
         scene = context.scene
 
         col = layout.column()
-        col.label(text="Camera:")
-        col.prop(view, "camera", text="")
         col.prop(view, "lens")
         col.label(text="Lock to Object:")
         col.prop(view, "lock_object", text="")
@@ -1861,6 +1859,11 @@
         col.prop(view, "clip_start", text="Start")
         col.prop(view, "clip_end", text="End")
 
+        subcol = col.column()
+        subcol.enabled = not view.lock_camera_and_layers
+        subcol.label(text="Local Camera:")
+        subcol.prop(view, "camera", text="")
+
         layout.column().prop(view, "cursor_location")