bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

2.6 UI:

Browse Source 
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.
This commit is contained in:
Thomas Dinges 2012-03-10 20:30:05 +00:00
parent bb82854d46
commit 83a5c943af
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
release/scripts/startup/bl_ui/properties_world.py
View File

@ -49,16 +49,17 @@ class WORLD_PT_context_world(WorldButtonsPanel, Panel):
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')

2
source/blender/makesrna/intern/rna_userdef.c
View File

@ -2056,7 +2056,7 @@ static void rna_def_userdef_themes(BlenderRNA *brna)
{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", ""},