diff options
author | Thomas Dinges <blender@dingto.org> | 2012-03-11 00:30:05 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2012-03-11 00:30:05 +0400 |
commit | 83a5c943af241a0db317c0886fc0f7e192f23208 (patch) | |
tree | b29565e1a089e49411da5f2be3c602dfe2f68a04 | |
parent | bb82854d46234bd986186c8f7a9779c3b8036bfb (diff) |
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.
-rw-r--r-- | release/scripts/startup/bl_ui/properties_world.py | 5 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_world.py b/release/scripts/startup/bl_ui/properties_world.py index 23f35d6d1e9..76d70aafc2e 100644 --- a/release/scripts/startup/bl_ui/properties_world.py +++ b/release/scripts/startup/bl_ui/properties_world.py @@ -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') diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 833385b410b..3673d21a9e6 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -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", ""}, |