[Bf-blender-cvs] [4a6f43d47ba] master: UI: Add extra file browser icons

William Reynish noreply at git.blender.org
Sun Sep 15 19:13:09 CEST 2019


Commit: 4a6f43d47baafa8b97bdfd35fc8f05653894c876
Author: William Reynish
Date:   Sun Sep 15 19:10:49 2019 +0200
Branches: master
https://developer.blender.org/rB4a6f43d47baafa8b97bdfd35fc8f05653894c876

UI: Add extra file browser icons

Desktop, External Drive & Network Drive

These were already in the icon sheet, but not added in the Blender side.

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

A	release/datafiles/blender_icons16/icon16_desktop.dat
A	release/datafiles/blender_icons16/icon16_external_drive.dat
A	release/datafiles/blender_icons16/icon16_network_drive.dat
A	release/datafiles/blender_icons32/icon32_desktop.dat
A	release/datafiles/blender_icons32/icon32_external_drive.dat
A	release/datafiles/blender_icons32/icon32_network_drive.dat
M	source/blender/editors/include/UI_icons.h

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

diff --git a/release/datafiles/blender_icons16/icon16_desktop.dat b/release/datafiles/blender_icons16/icon16_desktop.dat
new file mode 100644
index 00000000000..4a08daed9a9
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_desktop.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_external_drive.dat b/release/datafiles/blender_icons16/icon16_external_drive.dat
new file mode 100644
index 00000000000..3996681d0af
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_external_drive.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_network_drive.dat b/release/datafiles/blender_icons16/icon16_network_drive.dat
new file mode 100644
index 00000000000..8570bbc3634
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_network_drive.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_desktop.dat b/release/datafiles/blender_icons32/icon32_desktop.dat
new file mode 100644
index 00000000000..1400d07381d
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_desktop.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_external_drive.dat b/release/datafiles/blender_icons32/icon32_external_drive.dat
new file mode 100644
index 00000000000..cd16d0e1735
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_external_drive.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_network_drive.dat b/release/datafiles/blender_icons32/icon32_network_drive.dat
new file mode 100644
index 00000000000..36a18f0882c
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_network_drive.dat differ
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index ffabace48c0..4e4db46adf6 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -858,9 +858,9 @@ DEF_ICON_BLANK(855)
 DEF_ICON_BLANK(856)
 DEF_ICON_BLANK(857)
 DEF_ICON_BLANK(858)
-DEF_ICON_BLANK(859)
-DEF_ICON_BLANK(860)
-DEF_ICON_BLANK(861)
+DEF_ICON(DESKTOP)
+DEF_ICON(EXTERNAL_DRIVE)
+DEF_ICON(NETWORK_DRIVE)
 
 /* SEQUENCE / IMAGE EDITOR */
 DEF_ICON(SEQ_SEQUENCER)



More information about the Bf-blender-cvs mailing list