[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17575] branches/blender2.5/blender: Bringing back icons:

Andrea Weikert elubie at gmx.net
Tue Nov 25 20:23:54 CET 2008


Revision: 17575
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17575
Author:   elubie
Date:     2008-11-25 20:23:54 +0100 (Tue, 25 Nov 2008)

Log Message:
-----------
Bringing back icons:
Part 3/3: new icons
- Icon set done by jendrzych! Great job!
- cleaned up unnecessary includes and removed commented out code
- preview icons (for materials, textures,..) don't work yet, have to be ported to new event system

Modified Paths:
--------------
    branches/blender2.5/blender/projectfiles_vc9/blender/blender.vcproj
    branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/blender2.5/blender/release/datafiles/blenderbuttons
    branches/blender2.5/blender/source/blender/editors/datafiles/blenderbuttons.c
    branches/blender2.5/blender/source/blender/editors/include/UI_interface_icons.h
    branches/blender2.5/blender/source/blender/editors/interface/interface_draw.c
    branches/blender2.5/blender/source/blender/editors/interface/interface_icons.c
    branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
    branches/blender2.5/blender/source/blender/editors/interface/resources.c

Modified: branches/blender2.5/blender/projectfiles_vc9/blender/blender.vcproj
===================================================================
--- branches/blender2.5/blender/projectfiles_vc9/blender/blender.vcproj	2008-11-25 18:43:45 UTC (rev 17574)
+++ branches/blender2.5/blender/projectfiles_vc9/blender/blender.vcproj	2008-11-25 19:23:54 UTC (rev 17575)
@@ -148,7 +148,7 @@
 				AssemblerListingLocation="..\..\..\build\msvc_9\source\blender\debug\"
 				ObjectFile="..\..\..\build\msvc_9\source\blender\debug\"
 				ProgramDataBaseFileName="..\..\..\build\msvc_9\source\blender\debug\"
-				WarningLevel="2"
+				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 				CompileAs="0"

Modified: branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj	2008-11-25 18:43:45 UTC (rev 17574)
+++ branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj	2008-11-25 19:23:54 UTC (rev 17575)
@@ -128,7 +128,7 @@
 				AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\editors\debug\"
 				ObjectFile="..\..\..\..\build\msvc_9\source\blender\editors\debug\"
 				ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\editors\debug\"
-				WarningLevel="2"
+				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 				CompileAs="0"
@@ -194,6 +194,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\source\blender\editors\include\ED_markers.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\source\blender\editors\include\ED_mesh.h"
 				>
 			</File>
@@ -214,10 +218,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\source\blender\editors\include\ED_types.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\source\blender\editors\include\UI_interface.h"
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\source\blender\editors\include\UI_interface_icons.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\source\blender\editors\include\UI_resources.h"
 				>
 			</File>
@@ -271,6 +283,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\source\blender\editors\interface\interface_icons.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\source\blender\editors\interface\interface_ops.c"
 				>
 			</File>
@@ -307,6 +323,10 @@
 			Name="space_time"
 			>
 			<File
+				RelativePath="..\..\..\source\blender\editors\space_time\ed_markers.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\source\blender\editors\space_time\space_time.c"
 				>
 			</File>

Modified: branches/blender2.5/blender/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)

Modified: branches/blender2.5/blender/source/blender/editors/datafiles/blenderbuttons.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/datafiles/blenderbuttons.c	2008-11-25 18:43:45 UTC (rev 17574)
+++ branches/blender2.5/blender/source/blender/editors/datafiles/blenderbuttons.c	2008-11-25 19:23:54 UTC (rev 17575)
@@ -1,2020 +1,3248 @@
-/* DataToC output of file <blenderbuttons> */
-
-int datatoc_blenderbuttons_size= 64418;
-char datatoc_blenderbuttons[]= {
-137, 80,
- 78, 71, 13, 10, 26, 10,  0,  0,  0, 13, 73, 72, 68, 82,  0,  0,  2,  0,  0,  0,  1,  0,  8,  6,  0,  0,  0,197,144,206,103,  0,
-  0,  0,  1,115, 82, 71, 66,  0,174,206, 28,233,  0,  0,  0,  6, 98, 75, 71, 68,  0,255,  0,255,  0,255,160,189,167,147,  0,  0,
-  0,  9,112, 72, 89,115,  0,  0, 11, 19,  0,  0, 11, 19,  1,  0,154,156, 24,  0,  0,  0,  7,116, 73, 77, 69,  7,215, 11, 26, 20,
- 59, 43,  0,186, 29,  9,  0,  0, 32,  0, 73, 68, 65, 84,120,218,236,125,121, 92, 84, 85,255,255,251,220,217,217, 23,  1, 21,151,
-193,125, 95,201, 37, 55, 40, 53,243,155,153,  6,148,154,100,101, 98,137,218,147,166, 61,101,143,250,211, 71,197,164, 50, 53,161,
-167,210,172, 52,  5,115,201, 45, 81,  7,245, 81, 82,113, 47, 23, 20, 69,  4, 69,150, 97, 22,102,187,115,151,223, 31, 51, 67,  3,
-  2,179,128, 91,207,188, 95,220,215,229,222,123,238,103,206, 61,219,103, 61,231,144, 30, 61,122,240,240,192,  3, 15, 60,240,192,
-  3, 15,254,167, 64,121,138,192,  3, 15, 60,240,192,  3, 15,254,119,112,230,236,  1,  0,  0,241, 88,  0, 60,240,192,  3, 15, 60,
-240,192, 99,  1,240,192,  3, 15, 60,240,192,  3, 15, 60,  2,128,  7, 30,120,224,129,  7, 30,120,224, 17,  0, 60,240,192,  3, 15,
- 60,240,192,131,191,  5,132,246, 23,231,206,157, 35,238, 18,170, 41,150,192, 67,207, 67,175, 54,164,166,166,242,107,215,174,125,
-100,249, 27, 55,110, 28,191,105,211, 38,226,169,143, 39,154, 30,234, 65, 15,158,242,243,208,251, 59,211,115, 89,  0,248, 31, 71,
-245,  2, 36,143,115, 62, 83, 82, 82, 48,117,234, 84,226,169, 54,247,235,120,216,176, 97,149,215, 25, 25, 25,127,139,178, 28,253,
- 82, 66,157,  3,193,142,237,169,127,235, 54, 35, 11,220,  6,169,177, 13, 34, 64,163,  2,123,145, 99,152,247, 56,183, 69, 79,255,
-245,224,241,177,  0, 60,140,198, 58,122,244,232,168, 29, 59,118, 40,236,174,163,119,236,216,145,249, 88,244, 72,222, 50,118, 18,
-242,216,246, 75, 62, 47, 47, 15,  0, 32,151,203,159,164, 65,196,105,233,116,220,184,113, 78,167,221,180,105,147, 43,130, 26,191,
-101,203,150,202,139,109,219,182, 97,216,176, 97, 85,158, 63, 42, 33, 32, 59, 59,155,  7,128,200,200, 72,210, 16,233,118,108, 79,
-125,160,245, 23, 30,209, 28,  0,112,207,104,  4, 99, 48, 89,110,170, 52,  0,128,216,216, 88,164,165,165,213,154,191,222,185,189,
-249,182,119,219,186,244,227, 63, 15,252,217,137,122,145, 33,240,221,139, 48,238,216,134,242,242, 49, 40,  7,208, 75,246, 41,230,
-201, 78,163,185, 20, 40, 49,230, 98,158, 33,206,165,223,141,141,141,141, 74, 75, 75, 83, 84,187, 23,157,150,150,150,249,152,245,
-173,  6,105,183, 79,200,247, 54, 56,154,  4, 75,136,143,200,159,152,164, 98,222,164, 50, 80, 21,  6, 13,167, 51,153,255, 39,102,
-199, 57, 20,  0,172, 12,219,118,174,111, 67,224,119,236,216,129,133, 91, 22,195,167,185, 63, 42,110,171, 49, 63,110,158,226, 49,
-215,184, 31, 39, 16,185, 92,206,231,229,229, 33, 47, 47, 15,251,246,237,195,212,169, 83, 31, 87, 33,192,214,129, 72,106,106,170,
- 40, 33, 33,193,188,124,249,242, 83,  0, 48,103,206,156,167,234,122,113,204,152, 49,149,255, 51, 12, 11,218,108,  2,109,162, 65,
-211,150,131, 97, 24,204,153, 51,199,165,188,216, 51,255,154, 96, 21,  6,248, 71,105,  9,112, 69,248,121,100, 26,126,128, 31, 46,
-220,248, 25, 50, 52,  3,139, 99, 40,254,230, 12,206,231,150, 97,236,178,117, 78,189,222,246,110, 91, 39, 25,186,  5,175,254,247,
- 85,135,101, 34, 27, 57, 15, 65,163,223, 66,225,123,189,  0, 67,121,229,253, 51,134, 15,112,  6,  0, 12,192, 96, 89, 44, 14,  6,
-158, 70,  0,128,222,229,189,157,106, 51,105,105,105,247,221,180, 99,144,228, 49,234, 99, 13, 49,  6, 60,  9,223,219,160, 24,208,
-173,  7,121, 45, 60, 66,168,106,209, 72, 16,218, 49,156, 18,146, 80,162, 87,171, 57, 41,194, 88,170,103, 51,246,245, 81,195, 89,
- 39, 73,221,113,225,103,155, 58,145,102,150, 11,244,146, 31,168,  0,176, 99,199, 14,197,150, 79, 62, 66,220,162, 37,138,122, 54,
-  2,222,198,248,  1,160, 84, 95,  6,  4,  3,255, 60,184,  0,154, 27,229, 88,243,246,202,199,141,145,213, 54,240, 60,234, 60, 86,
- 10,  1, 35, 70,140, 64, 94, 94, 30,228,114,249, 99, 87,118, 10,133,101,220,136,142,142,230,  1, 80,169,169,169,225,  9,  9,  9,
-133,203,151, 47, 63,237, 44, 17,134, 97, 64,211,230, 74,198,111,207,252,179,179,179, 17, 25, 25,233, 82,166,226,226,226,236,153,
- 45, 50, 50, 50,170, 11,  0, 13,209, 86, 92,174,135,200,200, 72, 50,110,220, 56,126,248,240,225,247, 61,219,191,127,191,205,210,
- 97,179,122, 56, 77,191, 33,221,  1,225, 17,205, 81, 88,174,198, 47, 83, 95, 70, 48, 25,128,220,255,204, 70,171, 49,173,144,225,
-  2,243,175, 44, 44,171,169,141, 52,128,169, 45,124,203, 49,232,111, 85,160, 48, 33,162,206,116, 23,165,  7,176,176,235, 61, 44,
-189,248,113,125,235,179, 33,152,110, 67,210, 64,  3,211,122, 16,223,219, 32,136,143,143,247,  2,240, 52,  0, 31,187,219, 42,  0,
- 23, 54,108,216,160,116,150,206, 23,107,191,160,232, 82,147,136, 54, 25,165,229, 48, 75, 69, 34,161, 80, 99,148, 82, 98,177,129,
- 19,248,121, 51,180,204,108, 22, 22,221, 49,125,255,205,122,227,235,147, 39,177,206,124,183, 74,165,250,183,237,255,156,156,156,
- 82,111,111,111, 74,167,211,113,246,105,250,244,233,243,121,  3, 51,246, 89,245, 45, 83,161, 35,237,255,242,229,203,104,235,227,
-103,111, 13,112,199, 10, 80,201,252, 75,245,101, 88,250,236,130,202,  7,111,236,120, 23,  8,  5,198, 44,143,195,182, 57, 91, 92,
-105,100,117, 13,110,245,110,168,183,111,223,  6,  0, 52,111,222,188,202,255,112,193,156,221,128,130,  8,169, 77,  8, 48,155, 25,
- 91, 60, 64,131,104,  1, 13, 80,150,246,204, 31,  0, 72, 66, 66,  2,  0,220, 73, 77, 77, 13, 76, 72, 72, 40,119,154,249,155,205,
-160,105, 19, 76, 52, 13,115, 53,230,207,115,174, 85, 67, 92, 92, 28,178,179,179,255,234, 93,201,201,136,137,137,169,188, 78, 79,
- 79,175,183,176, 99, 39,240,212,187,253,217, 51,254,113,227,198,161,103,207,158, 54,  1,192, 85,139, 64,131, 52,194,130, 27,249,
-208,109,251, 23,124,222, 92,137,240,136,230,  8, 11,150,225,198,182, 27, 22,230, 31,224,103,113,  1,136,  4,206, 73,176, 13,228,
- 99,107,119,233, 58,110,207, 95, 12, 67,218,250,186, 45,  4, 50, 25,140, 70, 35,114,115,115, 81,108,188,138,118,  8,175, 53,173,
-213, 12, 94, 87,219, 39,182,126, 98, 77,155,233, 70,255, 34,118,253,154,119,179,159,145, 58, 24,183,211,109,176,166,239,141,137,
-137,225,  9, 33, 54, 87, 78,125,190,215,214,151,121,161, 80, 88,175, 58,143,143,143,247,  7, 48,230,224,193,131,255,226, 56,206,
-100,215,150,132,  2,129,192, 59, 62, 62,126,242,134, 13, 27,246, 56,228,152,115,103,  9, 75,239,148, 72, 69, 34,137, 55, 37, 36,
-126,188, 64,226,197,  9,  4, 66,142, 80,224,136,144,229,  5,  2,147,128, 35, 70,157,128,213,123,139, 69,228,155, 99,123,140,137,
- 73,147, 56,228, 59,206, 99,121,121,185, 70,175,215, 51,  0,160,211,233,184,143, 62,250,168,146,225, 47, 89,178,228, 31,245,109,
-239, 67,135, 14,157,106,251,255,192,129,  3, 41, 13,209,135, 40, 71,218,255,226, 87, 98, 96, 44, 41,193,236,206, 29, 96,239,187,
-119, 90, 11, 25, 61, 58, 10, 64, 21,230, 63,122,244,232,104,  0,100,244,232,209,209,235, 70,127,101,177, 44,182,111, 84, 37,189,

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list