[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44796] trunk/blender: 2.6 UI:

[Thomas Dinges]

Revision: 44796
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44796
Author:   dingto
Date:     2012-03-10 20:30:05 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
2.6 UI:
World Context:
* Made world id block wider
* Don't show texture user when Cycles engine is used
Other: 
* Change Dopesheet > DopeSheet in User Preferences Theme section for consistency. 

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_world.py
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_world.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_world.py	2012-03-10 20:08:25 UTC (rev 44795)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_world.py	2012-03-10 20:30:05 UTC (rev 44796)
@@ -49,16 +49,17 @@
         scene = context.scene
         world = context.world
         space = context.space_data
+        rd = context.scene.render
 
         texture_count = world and len(world.texture_slots.keys())
 
-        split = layout.split(percentage=0.65)
+        split = layout.split(percentage=0.85)
         if scene:
             split.template_ID(scene, "world", new="world.new")
         elif world:
             split.template_ID(space, "pin_id")
 
-        if texture_count:
+        if texture_count and rd.engine != 'CYCLES':
             split.label(text=str(texture_count), icon='TEXTURE')
 
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2012-03-10 20:08:25 UTC (rev 44795)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2012-03-10 20:30:05 UTC (rev 44796)
@@ -2056,7 +2056,7 @@
 		{1, "VIEW_3D", ICON_VIEW3D, "3D View", ""},
 		{2, "TIMELINE", ICON_TIME, "Timeline", ""},
 		{3, "GRAPH_EDITOR", ICON_IPO, "Graph Editor", ""},
-		{4, "DOPESHEET_EDITOR", ICON_ACTION, "Dopesheet", ""},
+		{4, "DOPESHEET_EDITOR", ICON_ACTION, "DopeSheet", ""},
 		{5, "NLA_EDITOR", ICON_NLA, "NLA Editor", ""},
 		{6, "IMAGE_EDITOR", ICON_IMAGE_COL, "UV/Image Editor", ""},
 		{7, "SEQUENCE_EDITOR", ICON_SEQUENCE, "Video Sequence Editor", ""},