[Bf-blender-cvs] [301fb14fbf3] master: Icons: Fix wrong icon names

[William Reynish]

Commit: 301fb14fbf3b47651199ff16a30ba1b7bc8715d4
Author: William Reynish
Date:   Mon May 20 10:38:47 2019 +0200
Branches: master
https://developer.blender.org/rB301fb14fbf3b47651199ff16a30ba1b7bc8715d4

Icons: Fix wrong icon names

Some file-related icon names were mixed up.

We have icons for cache, volume, 3rd party 3d files, hidden, backups, drives

===================================================================

D	release/datafiles/blender_icons16/icon16_alembic.dat
R100	release/datafiles/blender_icons16/icon16_volume.dat	release/datafiles/blender_icons16/icon16_file_3d.dat
A	release/datafiles/blender_icons16/icon16_file_cache.dat
M	release/datafiles/blender_icons16/icon16_file_volume.dat
D	release/datafiles/blender_icons32/icon32_alembic.dat
R100	release/datafiles/blender_icons32/icon32_volume.dat	release/datafiles/blender_icons32/icon32_file_3d.dat
A	release/datafiles/blender_icons32/icon32_file_cache.dat
M	release/datafiles/blender_icons32/icon32_file_volume.dat
M	source/blender/editors/include/UI_icons.h

===================================================================

diff --git a/release/datafiles/blender_icons16/icon16_alembic.dat b/release/datafiles/blender_icons16/icon16_alembic.dat
deleted file mode 100644
index a535ab2e076..00000000000
Binary files a/release/datafiles/blender_icons16/icon16_alembic.dat and /dev/null differ
diff --git a/release/datafiles/blender_icons16/icon16_volume.dat b/release/datafiles/blender_icons16/icon16_file_3d.dat
similarity index 100%
rename from release/datafiles/blender_icons16/icon16_volume.dat
rename to release/datafiles/blender_icons16/icon16_file_3d.dat
diff --git a/release/datafiles/blender_icons16/icon16_file_volume.dat b/release/datafiles/blender_icons16/icon16_file_cache.dat
similarity index 100%
copy from release/datafiles/blender_icons16/icon16_file_volume.dat
copy to release/datafiles/blender_icons16/icon16_file_cache.dat
diff --git a/release/datafiles/blender_icons16/icon16_file_volume.dat b/release/datafiles/blender_icons16/icon16_file_volume.dat
index 25abc74c4f8..a535ab2e076 100644
Binary files a/release/datafiles/blender_icons16/icon16_file_volume.dat and b/release/datafiles/blender_icons16/icon16_file_volume.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_alembic.dat b/release/datafiles/blender_icons32/icon32_alembic.dat
deleted file mode 100644
index 0d38bc7b575..00000000000
Binary files a/release/datafiles/blender_icons32/icon32_alembic.dat and /dev/null differ
diff --git a/release/datafiles/blender_icons32/icon32_volume.dat b/release/datafiles/blender_icons32/icon32_file_3d.dat
similarity index 100%
rename from release/datafiles/blender_icons32/icon32_volume.dat
rename to release/datafiles/blender_icons32/icon32_file_3d.dat
diff --git a/release/datafiles/blender_icons32/icon32_file_volume.dat b/release/datafiles/blender_icons32/icon32_file_cache.dat
similarity index 100%
copy from release/datafiles/blender_icons32/icon32_file_volume.dat
copy to release/datafiles/blender_icons32/icon32_file_cache.dat
diff --git a/release/datafiles/blender_icons32/icon32_file_volume.dat b/release/datafiles/blender_icons32/icon32_file_volume.dat
index 589fb101d96..0d38bc7b575 100644
Binary files a/release/datafiles/blender_icons32/icon32_file_volume.dat and b/release/datafiles/blender_icons32/icon32_file_volume.dat differ
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index 90105ac630e..941eff9d3bd 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -821,9 +821,9 @@ DEF_ICON(FORWARD)
 DEF_ICON_BLANK(825)
 DEF_ICON_BLANK(826)
 DEF_ICON_BLANK(827)
+DEF_ICON(FILE_CACHE)
 DEF_ICON(FILE_VOLUME)
-DEF_ICON(ALEMBIC)
-DEF_ICON(VOLUME)
+DEF_ICON(FILE_3D)
 DEF_ICON(FILE_HIDDEN)
 DEF_ICON(FILE_BACKUP)
 DEF_ICON(DISK_DRIVE)