Merged 15170:15635 from trunk (no conflicts or even merges)
[blender.git] / source / blender / include / BIF_resources.h
index adddb0d1347e4945c69410c26412aff3bac2e4af..df514190270acb8b7d95e9aac3ecb5fec1be0f62 100644 (file)
@@ -293,7 +293,7 @@ typedef enum {
        ICON_ARMATURE_DEHLT,
        ICON_SNAP_GEAR,
        ICON_SNAP_GEO,
-       ICON_BLANK41,
+       ICON_SNAP_NORMAL,
        ICON_BLANK42,
        
        ICON_SMOOTHCURVE,
@@ -591,6 +591,9 @@ void        BIF_load_ui_colors              (void);
 char   *BIF_ThemeGetColorPtr(struct bTheme *btheme, int spacetype, int colorid);
 char   *BIF_ThemeColorsPup(int spacetype);
 
+/* only for Bone Color sets */
+char *BIF_ThemeColorSetsPup(short inc_custom);
+
 
 void   BIF_def_color                   (BIFColorID colorid, unsigned char r, unsigned char g, unsigned char b);