svn merge ^/trunk/blender -r49241:49244
authorCampbell Barton <ideasman42@gmail.com>
Thu, 26 Jul 2012 10:55:07 +0000 (10:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 26 Jul 2012 10:55:07 +0000 (10:55 +0000)
1  2 
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c

index bdf4d77993ab2ac928899fd460d236120ffcf83b,ba6f1be42893a3832320eea77ddb577015ebdfef..062239375af3bb20d1202ad8fcf4d0f88843800f
@@@ -303,6 -303,8 +303,8 @@@ const unsigned char *UI_ThemeGetColorPt
                                        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 +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);
@@@ -1913,6 -1916,13 +1916,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) {
        if (U.dbl_click_time == 0) {
                U.dbl_click_time = 350;
        }
 -      if (U.anim_player_preset == 0) {
 -              U.anim_player_preset = 1;
 -      }
        if (U.scrcastfps == 0) {
                U.scrcastfps = 10;
                U.scrcastwait = 50;
index b2c4f9efd24852d712fed59406ace3d0b5d73a54,74780faa700de949c78b89743ff3899be98751a6..df98be71cfe89cc6db676325248dd4ecf3b0f9a9
@@@ -152,7 -152,6 +152,7 @@@ EnumPropertyItem clip_editor_mode_items
  #include "ED_sequencer.h"
  #include "ED_clip.h"
  
 +#include "IMB_colormanagement.h"
  #include "IMB_imbuf_types.h"
  
  static StructRNA *rna_Space_refine(struct PointerRNA *ptr)
@@@ -1922,7 -1921,7 +1922,7 @@@ static void rna_def_space_buttons(Blend
                {SB_TEXC_MAT_OR_LAMP, "MATERIAL", ICON_MATERIAL, "Material", "Material"},
                {0, NULL, 0, NULL, NULL}
        };                             /*actually populated dynamically trough a function */
 -              
 +
        srna = RNA_def_struct(brna, "SpaceProperties", "Space");
        RNA_def_struct_sdna(srna, "SpaceButs");
        RNA_def_struct_ui_text(srna, "Properties Space", "Properties space data");
@@@ -2045,7 -2044,7 +2045,7 @@@ static void rna_def_space_image(Blender
        RNA_def_property_enum_sdna(prop, NULL, "mode");
        RNA_def_property_enum_items(prop, image_space_mode_items);
        RNA_def_property_ui_text(prop, "Mode", "Editing context being displayed");
-       RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, "rna_SpaceImageEditor_mode_update");
+       RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, "rna_SpaceImageEditor_mode_update");
  
        /* grease pencil */
        prop = RNA_def_property(srna, "grease_pencil", PROP_POINTER, PROP_NONE);
        RNA_def_property_clear_flag(prop, PROP_EDITABLE);
        RNA_def_property_ui_text(prop, "Show UV Editor", "Show UV editing related properties");
  
 +      prop = RNA_def_property(srna, "view_settings", PROP_POINTER, PROP_NONE);
 +      RNA_def_property_pointer_sdna(prop, NULL, "view_settings");
 +      RNA_def_property_struct_type(prop, "ColorManagedViewSettings");
 +      RNA_def_property_ui_text(prop, "View Settings", "Color management settings used for displaying images on the display");
 +
        rna_def_space_image_uv(brna);
  
        /* mask */
@@@ -2197,11 -2191,6 +2197,11 @@@ static void rna_def_space_sequencer(Ble
        RNA_def_property_struct_type(prop, "GreasePencil");
        RNA_def_property_ui_text(prop, "Grease Pencil", "Grease pencil data for this space");
        RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL);
 +
 +      prop = RNA_def_property(srna, "view_settings", PROP_POINTER, PROP_NONE);
 +      RNA_def_property_pointer_sdna(prop, NULL, "view_settings");
 +      RNA_def_property_struct_type(prop, "ColorManagedViewSettings");
 +      RNA_def_property_ui_text(prop, "View Settings", "Color management settings used for displaying images on the display");
  }
  
  static void rna_def_space_text(BlenderRNA *brna)
@@@ -2996,11 -2985,6 +2996,11 @@@ static void rna_def_space_node(BlenderR
        RNA_def_property_ui_text(prop, "Draw Channels", "Channels of the image to draw");
        RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE_VIEW, NULL);
  
 +      prop = RNA_def_property(srna, "view_settings", PROP_POINTER, PROP_NONE);
 +      RNA_def_property_pointer_sdna(prop, NULL, "view_settings");
 +      RNA_def_property_struct_type(prop, "ColorManagedViewSettings");
 +      RNA_def_property_ui_text(prop, "View Settings", "Color management settings used for displaying images on the display");
 +
        prop = RNA_def_property(srna, "show_highlight", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", SNODE_SHOW_HIGHLIGHT);
        RNA_def_property_ui_text(prop, "Highlight", "Highlight nodes that are being calculated");
@@@ -3313,12 -3297,6 +3313,12 @@@ static void rna_def_space_clip(BlenderR
        RNA_def_property_enum_items(prop, pivot_items);
        RNA_def_property_ui_text(prop, "Pivot Point", "Pivot center for rotation/scaling");
        RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL);
 +
 +      /* color management view settings */
 +      prop = RNA_def_property(srna, "view_settings", PROP_POINTER, PROP_NONE);
 +      RNA_def_property_pointer_sdna(prop, NULL, "view_settings");
 +      RNA_def_property_struct_type(prop, "ColorManagedViewSettings");
 +      RNA_def_property_ui_text(prop, "View Settings", "Color management settings used for displaying images on the display");
  }
  
  
index 53a8616cb85f15e27deaf6c7f11d2e80e2f102de,5820de3a7e2aee2453bc31620fbc3f6fc4ddc37e..03fd144f7dd47c591451d7f2cfa880514830da68
@@@ -1183,6 -1183,11 +1183,11 @@@ static void rna_def_userdef_theme_space
        RNA_def_property_ui_text(prop, "Bone Pose", "");
        RNA_def_property_update(prop, 0, "rna_userdef_update");
  
+       prop = RNA_def_property(srna, "bone_pose_active", PROP_FLOAT, PROP_COLOR_GAMMA);
+       RNA_def_property_array(prop, 3);
+       RNA_def_property_ui_text(prop, "Bone Pose Active", "");
+       RNA_def_property_update(prop, 0, "rna_userdef_update");
        prop = RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR_GAMMA);
        RNA_def_property_float_sdna(prop, NULL, "cframe");
        RNA_def_property_array(prop, 3);
@@@ -3445,7 -3450,7 +3450,7 @@@ static void rna_def_userdef_filepaths(B
        StructRNA *srna;
        
        static EnumPropertyItem anim_player_presets[] = {
 -              /*{0, "INTERNAL", 0, "Internal", "Built-in animation player"},   *//* doesn't work yet! */
 +              {0, "INTERNAL", 0, "Internal", "Built-in animation player"}, /* doesn't work yet! */
                {1, "BLENDER24", 0, "Blender 2.4", "Blender command line animation playback - path to Blender 2.4"},
                {2, "DJV", 0, "Djv", "Open source frame player: http://djv.sourceforge.net"},
                {3, "FRAMECYCLER", 0, "FrameCycler", "Frame player from IRIDAS"},