Merge with trunk r39928
[blender-staging.git] / source / blender / editors / include / UI_icons.h
index b42639354077147e292585ffd98f53e28bc3a281..f8ea9615be298714445c8c320ff12cc3fc33d844 100644 (file)
@@ -396,8 +396,8 @@ DEF_ICON(LAMP_AREA)
 #ifndef DEF_ICON_BLANK_SKIP
        DEF_ICON(BLANK617)
        DEF_ICON(BLANK618)
-       DEF_ICON(BLANK619)
 #endif
+DEF_ICON(META_EMPTY)
 DEF_ICON(META_PLANE)
 DEF_ICON(META_CUBE)
 DEF_ICON(META_BALL)
@@ -589,8 +589,8 @@ DEF_ICON(MOD_MULTIRES)
 DEF_ICON(MOD_SMOKE)
 DEF_ICON(MOD_SOLIDIFY)
 DEF_ICON(MOD_SCREW)
+DEF_ICON(MOD_DYNAMICPAINT)
 #ifndef DEF_ICON_BLANK_SKIP
-       DEF_ICON(BLANK160)
        DEF_ICON(BLANK161)
        DEF_ICON(BLANK162)
        DEF_ICON(BLANK163)