[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32843] trunk/blender/source/blender: - remove BLANK* from rna icon enum, would string search this list for every python icon button call, enum from 818 down to 444.

Campbell Barton ideasman42 at gmail.com
Tue Nov 2 22:43:47 CET 2010 

Revision: 32843
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32843
Author:   campbellbarton
Date:     2010-11-02 22:43:47 +0100 (Tue, 02 Nov 2010)

Log Message:
-----------
- remove BLANK* from rna icon enum, would string search this list for every python icon button call, enum from 818 down to 444.
- remove unused space image members

Modified Paths:
--------------
    trunk/blender/source/blender/editors/include/UI_icons.h
    trunk/blender/source/blender/makesdna/DNA_space_types.h
    trunk/blender/source/blender/makesrna/intern/rna_ui_api.c

Modified: trunk/blender/source/blender/editors/include/UI_icons.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_icons.h	2010-11-02 21:16:41 UTC (rev 32842)
+++ trunk/blender/source/blender/editors/include/UI_icons.h	2010-11-02 21:43:47 UTC (rev 32843)
@@ -46,12 +46,18 @@
 DEF_ICON(RADIOBUT_OFF)
 DEF_ICON(RADIOBUT_ON)
 DEF_ICON(MENU_PANEL)
-DEF_ICON(BLANK002)
-DEF_ICON(BLANK003)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK002)
+	DEF_ICON(BLANK003)
+#endif
 DEF_ICON(DOT)
-DEF_ICON(BLANK004)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK004)
+#endif
 DEF_ICON(X)
-DEF_ICON(BLANK005)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK005)
+#endif
 DEF_ICON(GO_LEFT)
 DEF_ICON(PLUG)
 DEF_ICON(UI)
@@ -109,7 +115,9 @@
 DEF_ICON(QUIT)
 DEF_ICON(URL)
 DEF_ICON(RECOVER_LAST)
-DEF_ICON(BLANK038)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK038)
+#endif
 DEF_ICON(FULLSCREEN_ENTER)
 DEF_ICON(FULLSCREEN_EXIT)
 DEF_ICON(BLANK1)	// Not actually blank - this is used all over the place
@@ -129,19 +137,20 @@
 DEF_ICON(PHYSICS)
 DEF_ICON(SPEAKER)
 DEF_ICON(TEXTURE_SHADED) //ICON_BLANK041
-DEF_ICON(BLANK042)
-DEF_ICON(BLANK043)
-DEF_ICON(BLANK044)
-DEF_ICON(BLANK045)
-DEF_ICON(BLANK046)
-DEF_ICON(BLANK047)
-DEF_ICON(BLANK048)
-DEF_ICON(BLANK049)
-DEF_ICON(BLANK050)
-DEF_ICON(BLANK051)
-DEF_ICON(BLANK052)
-DEF_ICON(BLANK052b)
-	
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK042)
+	DEF_ICON(BLANK043)
+	DEF_ICON(BLANK044)
+	DEF_ICON(BLANK045)
+	DEF_ICON(BLANK046)
+	DEF_ICON(BLANK047)
+	DEF_ICON(BLANK048)
+	DEF_ICON(BLANK049)
+	DEF_ICON(BLANK050)
+	DEF_ICON(BLANK051)
+	DEF_ICON(BLANK052)
+	DEF_ICON(BLANK052b)
+#endif
 	/* EDITORS */
 DEF_ICON(VIEW3D)
 DEF_ICON(IPO)
@@ -163,13 +172,15 @@
 DEF_ICON(CONSOLE)
 DEF_ICON(PREFERENCES)
 DEF_ICON(ASSET_MANAGER)
-DEF_ICON(BLANK057)
-DEF_ICON(BLANK058)
-DEF_ICON(BLANK059)
-DEF_ICON(BLANK060)
-DEF_ICON(BLANK061)
-DEF_ICON(BLANK061b)
-	
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK057)
+	DEF_ICON(BLANK058)
+	DEF_ICON(BLANK059)
+	DEF_ICON(BLANK060)
+	DEF_ICON(BLANK061)
+	DEF_ICON(BLANK061b)
+#endif
+
 	/* MODES */
 DEF_ICON(OBJECT_DATAMODE)	// XXX fix this up
 DEF_ICON(EDITMODE_HLT)
@@ -181,22 +192,24 @@
 DEF_ICON(POSE_HLT)
 DEF_ICON(PARTICLEMODE)
 DEF_ICON(LIGHTPAINT)
-DEF_ICON(BLANK063)
-DEF_ICON(BLANK064)
-DEF_ICON(BLANK065)
-DEF_ICON(BLANK066)
-DEF_ICON(BLANK067)
-DEF_ICON(BLANK068)
-DEF_ICON(BLANK069)
-DEF_ICON(BLANK070)
-DEF_ICON(BLANK071)
-DEF_ICON(BLANK072)
-DEF_ICON(BLANK073)
-DEF_ICON(BLANK074)
-DEF_ICON(BLANK075)
-DEF_ICON(BLANK076)
-DEF_ICON(BLANK077)
-DEF_ICON(BLANK077b)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK063)
+	DEF_ICON(BLANK064)
+	DEF_ICON(BLANK065)
+	DEF_ICON(BLANK066)
+	DEF_ICON(BLANK067)
+	DEF_ICON(BLANK068)
+	DEF_ICON(BLANK069)
+	DEF_ICON(BLANK070)
+	DEF_ICON(BLANK071)
+	DEF_ICON(BLANK072)
+	DEF_ICON(BLANK073)
+	DEF_ICON(BLANK074)
+	DEF_ICON(BLANK075)
+	DEF_ICON(BLANK076)
+	DEF_ICON(BLANK077)
+	DEF_ICON(BLANK077b)
+#endif
 	
 	/* DATA */
 DEF_ICON(SCENE_DATA)
@@ -221,10 +234,14 @@
 DEF_ICON(CONSTRAINT)
 DEF_ICON(SHAPEKEY_DATA)
 DEF_ICON(CONSTRAINT_BONE)
-DEF_ICON(BLANK079)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK079)
+#endif
 DEF_ICON(PACKAGE)
 DEF_ICON(UGLYPACKAGE)
-DEF_ICON(BLANK079b)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK079b)
+#endif
 
 	/* DATA */
 DEF_ICON(BRUSH_DATA)
@@ -238,49 +255,57 @@
 DEF_ICON(SETTINGS)
 DEF_ICON(RENDER_ANIMATION)
 DEF_ICON(RENDER_STILL)
-DEF_ICON(BLANK080F)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK080F)
+#endif
 DEF_ICON(BOIDS)
 DEF_ICON(STRANDS)
 DEF_ICON(LIBRARY_DATA_INDIRECT)
 DEF_ICON(GREASEPENCIL)
-DEF_ICON(BLANK083)
-DEF_ICON(BLANK084)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK083)
+	DEF_ICON(BLANK084)
+#endif
 DEF_ICON(GROUP_BONE)
 DEF_ICON(GROUP_VERTEX)
 DEF_ICON(GROUP_VCOL)
 DEF_ICON(GROUP_UVS)
-DEF_ICON(BLANK089)
-DEF_ICON(BLANK090)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK089)
+	DEF_ICON(BLANK090)
+#endif
 DEF_ICON(RNA)
 DEF_ICON(RNA_ADD)
 
 	/* available */
-DEF_ICON(BLANK092)
-DEF_ICON(BLANK093)
-DEF_ICON(BLANK094)
-DEF_ICON(BLANK095)
-DEF_ICON(BLANK096)
-DEF_ICON(BLANK097)
-DEF_ICON(BLANK098)
-DEF_ICON(BLANK099)
-DEF_ICON(BLANK100)
-DEF_ICON(BLANK101)
-DEF_ICON(BLANK102)
-DEF_ICON(BLANK103)
-DEF_ICON(BLANK104)
-DEF_ICON(BLANK105)
-DEF_ICON(BLANK106)
-DEF_ICON(BLANK107)
-DEF_ICON(BLANK108)
-DEF_ICON(BLANK109)
-DEF_ICON(BLANK110)
-DEF_ICON(BLANK111)
-DEF_ICON(BLANK112)
-DEF_ICON(BLANK113)
-DEF_ICON(BLANK114)
-DEF_ICON(BLANK115)
-DEF_ICON(BLANK116)
-DEF_ICON(BLANK116b)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK092)
+	DEF_ICON(BLANK093)
+	DEF_ICON(BLANK094)
+	DEF_ICON(BLANK095)
+	DEF_ICON(BLANK096)
+	DEF_ICON(BLANK097)
+	DEF_ICON(BLANK098)
+	DEF_ICON(BLANK099)
+	DEF_ICON(BLANK100)
+	DEF_ICON(BLANK101)
+	DEF_ICON(BLANK102)
+	DEF_ICON(BLANK103)
+	DEF_ICON(BLANK104)
+	DEF_ICON(BLANK105)
+	DEF_ICON(BLANK106)
+	DEF_ICON(BLANK107)
+	DEF_ICON(BLANK108)
+	DEF_ICON(BLANK109)
+	DEF_ICON(BLANK110)
+	DEF_ICON(BLANK111)
+	DEF_ICON(BLANK112)
+	DEF_ICON(BLANK113)
+	DEF_ICON(BLANK114)
+	DEF_ICON(BLANK115)
+	DEF_ICON(BLANK116)
+	DEF_ICON(BLANK116b)
+#endif
 	
 	/* OUTLINER */
 DEF_ICON(OUTLINER_OB_EMPTY)
@@ -293,22 +318,26 @@
 DEF_ICON(OUTLINER_OB_ARMATURE)
 DEF_ICON(OUTLINER_OB_FONT)
 DEF_ICON(OUTLINER_OB_SURFACE)
-DEF_ICON(BLANK119)
-DEF_ICON(BLANK120)
-DEF_ICON(BLANK121)
-DEF_ICON(BLANK122)
-DEF_ICON(BLANK123)
-DEF_ICON(BLANK124)
-DEF_ICON(BLANK125)
-DEF_ICON(BLANK126)
-DEF_ICON(BLANK127)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK119)
+	DEF_ICON(BLANK120)
+	DEF_ICON(BLANK121)
+	DEF_ICON(BLANK122)
+	DEF_ICON(BLANK123)
+	DEF_ICON(BLANK124)
+	DEF_ICON(BLANK125)
+	DEF_ICON(BLANK126)
+	DEF_ICON(BLANK127)
+#endif
 DEF_ICON(RESTRICT_VIEW_OFF)
 DEF_ICON(RESTRICT_VIEW_ON)
 DEF_ICON(RESTRICT_SELECT_OFF)
 DEF_ICON(RESTRICT_SELECT_ON)
 DEF_ICON(RESTRICT_RENDER_OFF)
 DEF_ICON(RESTRICT_RENDER_ON)
-DEF_ICON(BLANK127b)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK127b)
+#endif
 
 	/* OUTLINER */
 DEF_ICON(OUTLINER_DATA_EMPTY)
@@ -322,21 +351,23 @@
 DEF_ICON(OUTLINER_DATA_FONT)
 DEF_ICON(OUTLINER_DATA_SURFACE)
 DEF_ICON(OUTLINER_DATA_POSE)
-DEF_ICON(BLANK129)
-DEF_ICON(BLANK130)
-DEF_ICON(BLANK131)
-DEF_ICON(BLANK132)
-DEF_ICON(BLANK133)
-DEF_ICON(BLANK134)
-DEF_ICON(BLANK135)
-DEF_ICON(BLANK136)
-DEF_ICON(BLANK137)
-DEF_ICON(BLANK138)
-DEF_ICON(BLANK139)
-DEF_ICON(BLANK140)
-DEF_ICON(BLANK141)
-DEF_ICON(BLANK142)
-DEF_ICON(BLANK142b)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK129)
+	DEF_ICON(BLANK130)
+	DEF_ICON(BLANK131)
+	DEF_ICON(BLANK132)
+	DEF_ICON(BLANK133)
+	DEF_ICON(BLANK134)
+	DEF_ICON(BLANK135)
+	DEF_ICON(BLANK136)
+	DEF_ICON(BLANK137)
+	DEF_ICON(BLANK138)
+	DEF_ICON(BLANK139)
+	DEF_ICON(BLANK140)
+	DEF_ICON(BLANK141)
+	DEF_ICON(BLANK142)
+	DEF_ICON(BLANK142b)
+#endif
 	
 	/* PRIMITIVES */
 DEF_ICON(MESH_PLANE)
@@ -349,22 +380,28 @@
 DEF_ICON(MESH_CYLINDER)
 DEF_ICON(MESH_TORUS)
 DEF_ICON(MESH_CONE)
-DEF_ICON(BLANK610)
-DEF_ICON(BLANK611)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK610)
+	DEF_ICON(BLANK611)
+#endif
 DEF_ICON(LAMP_POINT)
 DEF_ICON(LAMP_SUN)
 DEF_ICON(LAMP_SPOT)
 DEF_ICON(LAMP_HEMI)
 DEF_ICON(LAMP_AREA)
-DEF_ICON(BLANK617)
-DEF_ICON(BLANK618)
-DEF_ICON(BLANK619)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK617)
+	DEF_ICON(BLANK618)
+	DEF_ICON(BLANK619)
+#endif
 DEF_ICON(META_PLANE)
 DEF_ICON(META_CUBE)
 DEF_ICON(META_BALL)
 DEF_ICON(META_ELLIPSOID)
 DEF_ICON(META_CAPSULE)
-DEF_ICON(BLANK625)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK625)
+#endif
 	
 	/* PRIMITIVES */
 DEF_ICON(SURFACE_NCURVE)
@@ -373,26 +410,30 @@
 DEF_ICON(SURFACE_NCYLINDER)
 DEF_ICON(SURFACE_NSPHERE)
 DEF_ICON(SURFACE_NTORUS)
-DEF_ICON(BLANK636)
-DEF_ICON(BLANK637)
-DEF_ICON(BLANK638)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK636)
+	DEF_ICON(BLANK637)
+	DEF_ICON(BLANK638)
+#endif
 DEF_ICON(CURVE_BEZCURVE)
 DEF_ICON(CURVE_BEZCIRCLE)
 DEF_ICON(CURVE_NCURVE)
 DEF_ICON(CURVE_NCIRCLE)
 DEF_ICON(CURVE_PATH)
-DEF_ICON(BLANK644)
-DEF_ICON(BLANK645)
-DEF_ICON(BLANK646)
-DEF_ICON(BLANK647)
-DEF_ICON(BLANK648)
-DEF_ICON(BLANK649)
-DEF_ICON(BLANK650)
-DEF_ICON(BLANK651)
-DEF_ICON(BLANK652)
-DEF_ICON(BLANK653)
-DEF_ICON(BLANK654)
-DEF_ICON(BLANK655)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK644)
+	DEF_ICON(BLANK645)
+	DEF_ICON(BLANK646)
+	DEF_ICON(BLANK647)
+	DEF_ICON(BLANK648)
+	DEF_ICON(BLANK649)
+	DEF_ICON(BLANK650)
+	DEF_ICON(BLANK651)
+	DEF_ICON(BLANK652)
+	DEF_ICON(BLANK653)
+	DEF_ICON(BLANK654)
+	DEF_ICON(BLANK655)
+#endif
 	
 	/* EMPTY */
 DEF_ICON(FORCE_FORCE)
@@ -407,104 +448,106 @@
 DEF_ICON(FORCE_BOID)
 DEF_ICON(FORCE_TURBULENCE)
 DEF_ICON(FORCE_DRAG)
-DEF_ICON(BLANK672)
-DEF_ICON(BLANK673)
-DEF_ICON(BLANK674)
-DEF_ICON(BLANK675)
-DEF_ICON(BLANK676)
-DEF_ICON(BLANK677)
-DEF_ICON(BLANK678)
-DEF_ICON(BLANK679)
-DEF_ICON(BLANK680)
-DEF_ICON(BLANK681)
-DEF_ICON(BLANK682)
-DEF_ICON(BLANK683)
-DEF_ICON(BLANK684)
-DEF_ICON(BLANK685)
+#ifndef DEF_ICON_BLANK_SKIP
+	DEF_ICON(BLANK672)
+	DEF_ICON(BLANK673)
+	DEF_ICON(BLANK674)
+	DEF_ICON(BLANK675)
+	DEF_ICON(BLANK676)
+	DEF_ICON(BLANK677)
+	DEF_ICON(BLANK678)
+	DEF_ICON(BLANK679)
+	DEF_ICON(BLANK680)
+	DEF_ICON(BLANK681)
+	DEF_ICON(BLANK682)
+	DEF_ICON(BLANK683)
+	DEF_ICON(BLANK684)
+	DEF_ICON(BLANK685)
 
 	/* EMPTY */
-DEF_ICON(BLANK690)
-DEF_ICON(BLANK691)
-DEF_ICON(BLANK692)
-DEF_ICON(BLANK693)
-DEF_ICON(BLANK694)
-DEF_ICON(BLANK695)
-DEF_ICON(BLANK696)
-DEF_ICON(BLANK697)
-DEF_ICON(BLANK698)
-DEF_ICON(BLANK699)
-DEF_ICON(BLANK700)
-DEF_ICON(BLANK701)
-DEF_ICON(BLANK702)
-DEF_ICON(BLANK703)
-DEF_ICON(BLANK704)
-DEF_ICON(BLANK705)
-DEF_ICON(BLANK706)
-DEF_ICON(BLANK707)
-DEF_ICON(BLANK708)
-DEF_ICON(BLANK709)
-DEF_ICON(BLANK710)
-DEF_ICON(BLANK711)
-DEF_ICON(BLANK712)
-DEF_ICON(BLANK713)
-DEF_ICON(BLANK714)
-DEF_ICON(BLANK715)
+	DEF_ICON(BLANK690)
+	DEF_ICON(BLANK691)
+	DEF_ICON(BLANK692)
+	DEF_ICON(BLANK693)
+	DEF_ICON(BLANK694)
+	DEF_ICON(BLANK695)
+	DEF_ICON(BLANK696)
+	DEF_ICON(BLANK697)
+	DEF_ICON(BLANK698)
+	DEF_ICON(BLANK699)
+	DEF_ICON(BLANK700)
+	DEF_ICON(BLANK701)
+	DEF_ICON(BLANK702)
+	DEF_ICON(BLANK703)
+	DEF_ICON(BLANK704)
+	DEF_ICON(BLANK705)
+	DEF_ICON(BLANK706)
+	DEF_ICON(BLANK707)
+	DEF_ICON(BLANK708)
+	DEF_ICON(BLANK709)
+	DEF_ICON(BLANK710)
+	DEF_ICON(BLANK711)
+	DEF_ICON(BLANK712)
+	DEF_ICON(BLANK713)
+	DEF_ICON(BLANK714)
+	DEF_ICON(BLANK715)
 	
 	/* EMPTY */
-DEF_ICON(BLANK720)
-DEF_ICON(BLANK721)
-DEF_ICON(BLANK722)
-DEF_ICON(BLANK733)
-DEF_ICON(BLANK734)
-DEF_ICON(BLANK735)
-DEF_ICON(BLANK736)
-DEF_ICON(BLANK737)
-DEF_ICON(BLANK738)
-DEF_ICON(BLANK739)
-DEF_ICON(BLANK740)
-DEF_ICON(BLANK741)
-DEF_ICON(BLANK742)
-DEF_ICON(BLANK743)
-DEF_ICON(BLANK744)
-DEF_ICON(BLANK745)
-DEF_ICON(BLANK746)
-DEF_ICON(BLANK747)
-DEF_ICON(BLANK748)
-DEF_ICON(BLANK749)
-DEF_ICON(BLANK750)
-DEF_ICON(BLANK751)
-DEF_ICON(BLANK752)
-DEF_ICON(BLANK753)

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list