Merging r39652 through r39842 from trunk into vgroup_modifiers.

[blender-staging.git] / source / blender / editors / include / UI_icons.h

diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index dc1c20dcca5cf05da1271b095573c9308c2b373f..0c553a1838183a35e1979270f1ceb96fa91d6971 100644 (file)
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -322,8 +322,8 @@ DEF_ICON(OUTLINER_OB_CAMERA)
 DEF_ICON(OUTLINER_OB_ARMATURE)
 DEF_ICON(OUTLINER_OB_FONT)
 DEF_ICON(OUTLINER_OB_SURFACE)
 DEF_ICON(OUTLINER_OB_ARMATURE)
 DEF_ICON(OUTLINER_OB_FONT)
 DEF_ICON(OUTLINER_OB_SURFACE)

+DEF_ICON(OUTLINER_OB_SPEAKER)

 #ifndef DEF_ICON_BLANK_SKIP
 #ifndef DEF_ICON_BLANK_SKIP

-       DEF_ICON(BLANK119)

        DEF_ICON(BLANK120)
        DEF_ICON(BLANK121)
        DEF_ICON(BLANK122)
        DEF_ICON(BLANK120)
        DEF_ICON(BLANK121)
        DEF_ICON(BLANK122)


@@ -354,9 +354,9 @@ DEF_ICON(OUTLINER_DATA_CAMERA)
 DEF_ICON(OUTLINER_DATA_ARMATURE)
 DEF_ICON(OUTLINER_DATA_FONT)
 DEF_ICON(OUTLINER_DATA_SURFACE)
 DEF_ICON(OUTLINER_DATA_ARMATURE)
 DEF_ICON(OUTLINER_DATA_FONT)
 DEF_ICON(OUTLINER_DATA_SURFACE)

+DEF_ICON(OUTLINER_DATA_SPEAKER)

 DEF_ICON(OUTLINER_DATA_POSE)
 #ifndef DEF_ICON_BLANK_SKIP
 DEF_ICON(OUTLINER_DATA_POSE)
 #ifndef DEF_ICON_BLANK_SKIP

-       DEF_ICON(BLANK129)

        DEF_ICON(BLANK130)
        DEF_ICON(BLANK131)
        DEF_ICON(BLANK132)
        DEF_ICON(BLANK130)
        DEF_ICON(BLANK131)
        DEF_ICON(BLANK132)


@@ -633,21 +633,20 @@ DEF_ICON(MARKER_HLT)
 DEF_ICON(MARKER)
 DEF_ICON(SPACE2)       // XXX
 DEF_ICON(SPACE3)       // XXX
 DEF_ICON(MARKER)
 DEF_ICON(SPACE2)       // XXX
 DEF_ICON(SPACE3)       // XXX

-#ifndef DEF_ICON_BLANK_SKIP
-       DEF_ICON(BLANK181)
-#endif
+DEF_ICON(KEYINGSET)

 DEF_ICON(KEY_DEHLT)
 DEF_ICON(KEY_HLT)
 DEF_ICON(MUTE_IPO_OFF)
 DEF_ICON(MUTE_IPO_ON)
 DEF_ICON(KEY_DEHLT)
 DEF_ICON(KEY_HLT)
 DEF_ICON(MUTE_IPO_OFF)
 DEF_ICON(MUTE_IPO_ON)

-#ifndef DEF_ICON_BLANK_SKIP
-       DEF_ICON(BLANK182)
-       DEF_ICON(BLANK183)
-       DEF_ICON(BLANK183b)
+DEF_ICON(VISIBLE_IPO_OFF)
+DEF_ICON(VISIBLE_IPO_ON)
+DEF_ICON(DRIVER)

 
 

+       /* ANIMATION */
+DEF_ICON(SOLO_OFF)
+DEF_ICON(SOLO_ON)
+#ifndef DEF_ICON_BLANK_SKIP

        /* available */
        /* available */

-       DEF_ICON(BLANK184)
-       DEF_ICON(BLANK185)

        DEF_ICON(BLANK186)
        DEF_ICON(BLANK187)
        DEF_ICON(BLANK188)
        DEF_ICON(BLANK186)
        DEF_ICON(BLANK187)
        DEF_ICON(BLANK188)