svn merge ^/trunk/blender -r49241:49244
[blender.git] / source / blender / editors / interface / resources.c
index bdf4d77993ab2ac928899fd460d236120ffcf83b..062239375af3bb20d1202ad8fcf4d0f88843800f 100644 (file)
@@ -303,6 +303,8 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
                                        cp = ts->bone_solid; break;
                                case TH_BONE_POSE:
                                        cp = ts->bone_pose; break;
+                               case TH_BONE_POSE_ACTIVE:
+                                       cp = ts->bone_pose_active; break;
                                case TH_STRIP:
                                        cp = ts->strip; break;
                                case TH_STRIP_SELECT:
@@ -739,6 +741,7 @@ void ui_theme_init_default(void)
        rgba_char_args_set(btheme->tv3d.bone_solid, 200, 200, 200, 255);
        /* alpha 80 is not meant editable, used for wire+action draw */
        rgba_char_args_set(btheme->tv3d.bone_pose, 80, 200, 255, 80);
+       rgba_char_args_set(btheme->tv3d.bone_pose_active, 140, 255, 255, 80);
 
        rgba_char_args_set(btheme->tv3d.bundle_solid, 200, 200, 200, 255);
        rgba_char_args_set(btheme->tv3d.camera_path, 0x00, 0x00, 0x00, 255);
@@ -1914,6 +1917,13 @@ void init_userdef_do_versions(void)
                }
        }
 
+       if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 15)) {
+               bTheme *btheme;
+               for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+                       rgba_char_args_set(btheme->tv3d.bone_pose_active, 140, 255, 255, 80);
+               }
+       }
+
        /* GL Texture Garbage Collection (variable abused above!) */
        if (U.textimeout == 0) {
                U.texcollectrate = 60;