Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2011-02-14 06:43:28 +0300
committerJoshua Leung <aligorith@gmail.com>2011-02-14 06:43:28 +0300
commit54190dd8e5562cf5f964e6bb60be170c9063c616 (patch)
treed00fe6f6eb64830399468ee460d8718e7b4605a3
parent0c2099086b77d5438894d52847fa0c2a68bd0c81 (diff)
Bone Colour Sets (theme ones) can now be edited from the User
Preferences UI again
-rw-r--r--release/scripts/ui/space_userpref.py22
-rw-r--r--source/blender/makesrna/intern/rna_userdef.c1
2 files changed, 23 insertions, 0 deletions
diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py
index 79bdff8ad93..33d56de1cee 100644
--- a/release/scripts/ui/space_userpref.py
+++ b/release/scripts/ui/space_userpref.py
@@ -635,7 +635,29 @@ class USERPREF_PT_theme(bpy.types.Panel):
layout.separator()
layout.separator()
+ elif theme.theme_area == 'COLOR_SETS':
+ col = split.column()
+ for i,ui in enumerate(theme.bone_color_sets):
+ col.label(text="Color Set %d:" % (i+1)) # i starts from 0
+
+ row = col.row()
+
+ subsplit = row.split(percentage=0.95)
+
+ padding = subsplit.split(percentage=0.15)
+ colsub = padding.column()
+ colsub = padding.column()
+ colsub.row().prop(ui, "normal")
+ colsub.row().prop(ui, "select")
+ colsub.row().prop(ui, "active")
+
+ subsplit = row.split(percentage=0.85)
+
+ padding = subsplit.split(percentage=0.15)
+ colsub = padding.column()
+ colsub = padding.column()
+ colsub.row().prop(ui, "show_colored_constraints")
else:
self._theme_generic(split, getattr(theme, theme.theme_area.lower()))
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index b2b38bc38be..7959d139833 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -1708,6 +1708,7 @@ static void rna_def_userdef_themes(BlenderRNA *brna)
static EnumPropertyItem active_theme_area[] = {
{0, "USER_INTERFACE", ICON_UI, "User Interface", ""},
+ {18, "COLOR_SETS", ICON_COLOR, "Bone Color Sets", ""},
{1, "VIEW_3D", ICON_VIEW3D, "3D View", ""},
{2, "TIMELINE", ICON_TIME, "Timeline", ""},
{3, "GRAPH_EDITOR", ICON_IPO, "Graph Editor", ""},