[Bf-blender-cvs] [c7bcd63] multiview: Multiview: support cltr+click rename for non left/right views

Dalai Felinto noreply at git.blender.org
Sat May 10 20:18:18 CEST 2014


Commit: c7bcd6310b557b180cead9da79058b4ed8f9bc8a
Author: Dalai Felinto
Date:   Sat May 10 14:59:48 2014 -0300
https://developer.blender.org/rBc7bcd6310b557b180cead9da79058b4ed8f9bc8a

Multiview: support cltr+click rename for non left/right views

===================================================================

M	intern/cycles/blender/addon/ui.py
M	release/scripts/startup/bl_ui/properties_render_layer.py

===================================================================

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 7c893fe..e542381 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -449,7 +449,7 @@ class CyclesRender_PT_views(CyclesButtonsPanel, Panel):
 
         else:
             row = layout.row()
-            row.template_list("RENDERLAYER_UL_renderviews", "", rd, "views", rd.views, "active_index", rows=2)
+            row.template_list("RENDERLAYER_UL_renderviews", "name", rd, "views", rd.views, "active_index", rows=2)
 
             col = row.column(align=True)
             col.operator("scene.render_view_add", icon='ZOOMIN', text="")
diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py b/release/scripts/startup/bl_ui/properties_render_layer.py
index 52946cf..22fa423 100644
--- a/release/scripts/startup/bl_ui/properties_render_layer.py
+++ b/release/scripts/startup/bl_ui/properties_render_layer.py
@@ -168,8 +168,12 @@ class RENDERLAYER_UL_renderviews(UIList):
         # assert(isinstance(item, bpy.types.SceneRenderView)
         view = item
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
-            layout.label(view.name, icon_value=icon + (not view.use))
+            if view.name in ('left', 'right', 'Left', 'Right'): #MV remove left, right when I implement the ui names capitalized
+                layout.label(view.name, icon_value=icon + (not view.use))
+            else:
+                layout.prop(view, "name", text="", index=index, icon_value=icon, emboss=False)
             layout.prop(view, "use", text="", index=index)
+
         elif self.layout_type in {'GRID'}:
             layout.alignment = 'CENTER'
             layout.label("", icon_value=icon + (not view.use))
@@ -199,7 +203,7 @@ class RENDERLAYER_PT_views(RenderLayerButtonsPanel, Panel):
 
         if basic_stereo:
             row = layout.row()
-            row.template_list("RENDERLAYER_UL_renderviews", "", rd, "stereo_views", rd.views, "active_index", rows=2)
+            row.template_list("RENDERLAYER_UL_renderviews", "name", rd, "stereo_views", rd.views, "active_index", rows=2)
 
             row = layout.row()
             row.label(text="File Suffix:")
@@ -207,17 +211,13 @@ class RENDERLAYER_PT_views(RenderLayerButtonsPanel, Panel):
 
         else:
             row = layout.row()
-            row.template_list("RENDERLAYER_UL_renderviews", "", rd, "views", rd.views, "active_index", rows=2)
+            row.template_list("RENDERLAYER_UL_renderviews", "name", rd, "views", rd.views, "active_index", rows=2)
 
             col = row.column(align=True)
             col.operator("scene.render_view_add", icon='ZOOMIN', text="")
             col.operator("scene.render_view_remove", icon='ZOOMOUT', text="")
 
             row = layout.row()
-            if rv and rv.name not in ('left', 'right'):
-                row.prop(rv, "name")
-
-            row = layout.row()
             row.label(text="Camera Suffix:")
             row.prop(rv, "camera_suffix", text="")




More information about the Bf-blender-cvs mailing list