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 63ce23d2647657a5c8ea4fee3fde1b903a762275..15329b26ad1bb1bdf2fcf1df2fad16bb355b7755 100644 (file)
--- 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\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\..\..\source\icons\winplayer.rc\r
+SOURCE=..\..\..\..\source\icons\winblender.rc\r

 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r


@@ -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"\r
 # Begin Source File\r
 \r
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
 # Begin Source File\r
 \r

-SOURCE=..\..\..\..\source\icons\winplayer.ico\r
+SOURCE=..\..\..\..\source\icons\winblender.ico\r

 # End Source File\r
 # End Group\r
 # Begin Source File\r
 # End Source File\r
 # End Group\r
 # Begin Source File\r

diff --git a/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj b/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
index 556b5183585caf5f79261f7d8f14e4b5274068e8..0c42ac819b468bc2e1d9bfcd212062fab726f114 100644 (file)
--- 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\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
                                <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
                        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
                        </File>
                </Filter>
                <File

diff --git a/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj b/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
index 759c469bcf6b288ebca274e4458d8401a61fa554..feca77856bb4a2230db1ef4261253c85981e5111 100644 (file)
--- a/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
+++ b/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
@@ -239,7 +239,7 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\..\..\source\icons\winplayer.rc"\r
+                               RelativePath="..\..\..\..\source\icons\winblender.rc"\r

                                >\r
                                <FileConfiguration\r
                                        Name="BlenderPlayer Debug|Win32"\r
                                >\r
                                <FileConfiguration\r
                                        Name="BlenderPlayer Debug|Win32"\r


@@ -285,7 +285,7 @@
                        Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
                        >\r
                        <File\r
                        Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
                        >\r
                        <File\r

-                               RelativePath="..\..\..\..\source\icons\winplayer.ico"\r
+                               RelativePath="..\..\..\..\source\icons\winblender.ico"\r

                                >\r
                        </File>\r
                </Filter>\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/source/icons/wincreator.ico b/source/icons/wincreator.ico
deleted file mode 100644 (file)
index 4fb7be0..0000000
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 (file)
index e11bdaf..0000000
--- 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 (file)
index 8b23d5c..0000000
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 (file)
index 336ff09..0000000
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 (file)
index e2b255e..0000000
--- 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 (file)
index 9a6f469..0000000
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 (file)
index b296c0f..0000000
--- a/source/icons/winpublisher.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-APPICON                ICON    "winpublisher.ico"
-BLENDERFILE    ICON    "winblenderfile.ico"
-LOCKEDFILE     ICON    "winlockedfile.ico"