From: Thomas Dinges <blender@dingto.org>
Date: Sun, 5 Sep 2010 07:08:21 +0000 (+0000)
Subject: Windows Icons:
X-Git-Tag: v2.54~80
X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender.git/commitdiff_plain/e6f9d3d541bf5ddc44758811a9f9b4bf339da950?hp=75f8a8a1642354477b62973ee5ba6bf70b9f8ef9

Windows Icons:
* Removed old not used icons.
* Player is using the same icon file as the blender.exe now.
---

diff --git a/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp b/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp
index 63ce23d2647..15329b26ad1 100644
--- a/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp
+++ b/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp
@@ -117,7 +117,7 @@ SOURCE=..\..\..\..\source\blender\blenkernel\bad_level_call_stubs\stubs.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\source\icons\winplayer.rc
+SOURCE=..\..\..\..\source\icons\winblender.rc
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -145,7 +145,7 @@ SOURCE=..\..\..\..\source\gameengine\GamePlayer\ghost\GPG_System.h
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # Begin Source File
 
-SOURCE=..\..\..\..\source\icons\winplayer.ico
+SOURCE=..\..\..\..\source\icons\winblender.ico
 # End Source File
 # End Group
 # Begin Source File
diff --git a/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj b/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
index 556b5183585..0c42ac819b4 100644
--- a/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
+++ b/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
@@ -189,7 +189,7 @@ ECHO Done
 				RelativePath="..\..\..\..\source\blender\blenkernel\bad_level_call_stubs\stubs.c">
 			</File>
 			<File
-				RelativePath="..\..\..\..\source\icons\winplayer.rc">
+				RelativePath="..\..\..\..\source\icons\winblender.rc">
 				<FileConfiguration
 					Name="BlenderPlayer Debug|Win32">
 					<Tool
@@ -224,7 +224,7 @@ ECHO Done
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 			<File
-				RelativePath="..\..\..\..\source\icons\winplayer.ico">
+				RelativePath="..\..\..\..\source\icons\winblender.ico">
 			</File>
 		</Filter>
 		<File
diff --git a/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj b/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
index 759c469bcf6..feca77856bb 100644
--- a/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
+++ b/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
@@ -239,7 +239,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\source\icons\winplayer.rc"
+				RelativePath="..\..\..\..\source\icons\winblender.rc"
 				>
 				<FileConfiguration
 					Name="BlenderPlayer Debug|Win32"
@@ -285,7 +285,7 @@
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
 			<File
-				RelativePath="..\..\..\..\source\icons\winplayer.ico"
+				RelativePath="..\..\..\..\source\icons\winblender.ico"
 				>
 			</File>
 		</Filter>
diff --git a/source/icons/wincreator.ico b/source/icons/wincreator.ico
deleted file mode 100644
index 4fb7be08788..00000000000
Binary files a/source/icons/wincreator.ico and /dev/null differ
diff --git a/source/icons/wincreator.rc b/source/icons/wincreator.rc
deleted file mode 100644
index e11bdaf15e3..00000000000
--- a/source/icons/wincreator.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-APPICON 	ICON     "wincreator.ico"
-BLENDERFILE	ICON     "winblenderfile.ico"
diff --git a/source/icons/winlockedfile.ico b/source/icons/winlockedfile.ico
deleted file mode 100644
index 8b23d5c3d4d..00000000000
Binary files a/source/icons/winlockedfile.ico and /dev/null differ
diff --git a/source/icons/winplayer.ico b/source/icons/winplayer.ico
deleted file mode 100644
index 336ff09f94f..00000000000
Binary files a/source/icons/winplayer.ico and /dev/null differ
diff --git a/source/icons/winplayer.rc b/source/icons/winplayer.rc
deleted file mode 100644
index e2b255e7280..00000000000
--- a/source/icons/winplayer.rc
+++ /dev/null
@@ -1 +0,0 @@
-APPICON		ICON     "winplayer.ico"
diff --git a/source/icons/winpublisher.ico b/source/icons/winpublisher.ico
deleted file mode 100644
index 9a6f4690681..00000000000
Binary files a/source/icons/winpublisher.ico and /dev/null differ
diff --git a/source/icons/winpublisher.rc b/source/icons/winpublisher.rc
deleted file mode 100644
index b296c0ffc8f..00000000000
--- a/source/icons/winpublisher.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-APPICON		ICON	"winpublisher.ico"
-BLENDERFILE	ICON	"winblenderfile.ico"
-LOCKEDFILE	ICON	"winlockedfile.ico"