diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-03 00:43:47 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-03 00:43:47 +0300 |
commit | 1c5f72f273215c1d1bfda07443e9ccc93b42ca2b (patch) | |
tree | d3adebb0e02e9c6b0ad0bc918378619eb4f48a85 | |
parent | 09435ec149b499fabb112114bcdd24a9b3dc6cda (diff) |
- 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
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 843 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 36 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_ui_api.c | 3 |
3 files changed, 485 insertions, 397 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 5aff480647e..a145df908b9 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -46,12 +46,18 @@ DEF_ICON(DISCLOSURE_TRI_RIGHT) 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(FILE_TICK) 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(PARTICLES) 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(LOGIC) 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(SCULPTMODE_HLT) 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(BONE_DATA) 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(EMPTY_DATA) 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_CAMERA) 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_ARMATURE) 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_MONKEY) 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_NSURFACE) 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_CURVE) 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) -DEF_ICON(BLANK754) -DEF_ICON(BLANK755) + 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) + DEF_ICON(BLANK754) + DEF_ICON(BLANK755) /* EMPTY */ -DEF_ICON(BLANK760) -DEF_ICON(BLANK761) -DEF_ICON(BLANK762) -DEF_ICON(BLANK763) -DEF_ICON(BLANK764) -DEF_ICON(BLANK765) -DEF_ICON(BLANK766) -DEF_ICON(BLANK767) -DEF_ICON(BLANK768) -DEF_ICON(BLANK769) -DEF_ICON(BLANK770) -DEF_ICON(BLANK771) -DEF_ICON(BLANK772) -DEF_ICON(BLANK773) -DEF_ICON(BLANK774) -DEF_ICON(BLANK775) -DEF_ICON(BLANK776) -DEF_ICON(BLANK777) -DEF_ICON(BLANK778) -DEF_ICON(BLANK779) -DEF_ICON(BLANK780) -DEF_ICON(BLANK781) -DEF_ICON(BLANK782) -DEF_ICON(BLANK783) -DEF_ICON(BLANK784) -DEF_ICON(BLANK785) + DEF_ICON(BLANK760) + DEF_ICON(BLANK761) + DEF_ICON(BLANK762) + DEF_ICON(BLANK763) + DEF_ICON(BLANK764) + DEF_ICON(BLANK765) + DEF_ICON(BLANK766) + DEF_ICON(BLANK767) + DEF_ICON(BLANK768) + DEF_ICON(BLANK769) + DEF_ICON(BLANK770) + DEF_ICON(BLANK771) + DEF_ICON(BLANK772) + DEF_ICON(BLANK773) + DEF_ICON(BLANK774) + DEF_ICON(BLANK775) + DEF_ICON(BLANK776) + DEF_ICON(BLANK777) + DEF_ICON(BLANK778) + DEF_ICON(BLANK779) + DEF_ICON(BLANK780) + DEF_ICON(BLANK781) + DEF_ICON(BLANK782) + DEF_ICON(BLANK783) + DEF_ICON(BLANK784) + DEF_ICON(BLANK785) +#endif /* MODIFIERS */ DEF_ICON(MODIFIER) @@ -542,25 +585,27 @@ DEF_ICON(MOD_MULTIRES) DEF_ICON(MOD_SMOKE) DEF_ICON(MOD_SOLIDIFY) DEF_ICON(MOD_SCREW) -DEF_ICON(BLANK160) -DEF_ICON(BLANK161) -DEF_ICON(BLANK162) -DEF_ICON(BLANK163) -DEF_ICON(BLANK164) -DEF_ICON(BLANK165) -DEF_ICON(BLANK166) -DEF_ICON(BLANK167) -DEF_ICON(BLANK168) -DEF_ICON(BLANK169) -DEF_ICON(BLANK170) -DEF_ICON(BLANK171) -DEF_ICON(BLANK172) -DEF_ICON(BLANK173) -DEF_ICON(BLANK174) -DEF_ICON(BLANK175) -DEF_ICON(BLANK176) -DEF_ICON(BLANK177) -DEF_ICON(BLANK177b) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK160) + DEF_ICON(BLANK161) + DEF_ICON(BLANK162) + DEF_ICON(BLANK163) + DEF_ICON(BLANK164) + DEF_ICON(BLANK165) + DEF_ICON(BLANK166) + DEF_ICON(BLANK167) + DEF_ICON(BLANK168) + DEF_ICON(BLANK169) + DEF_ICON(BLANK170) + DEF_ICON(BLANK171) + DEF_ICON(BLANK172) + DEF_ICON(BLANK173) + DEF_ICON(BLANK174) + DEF_ICON(BLANK175) + DEF_ICON(BLANK176) + DEF_ICON(BLANK177) + DEF_ICON(BLANK177b) +#endif /* ANIMATION */ DEF_ICON(REC) @@ -573,7 +618,9 @@ DEF_ICON(NEXT_KEYFRAME) DEF_ICON(PLAY_AUDIO) DEF_ICON(PLAY_REVERSE) DEF_ICON(PREVIEW_RANGE) -DEF_ICON(BLANK180) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK180) +#endif DEF_ICON(PMARKER_ACT) DEF_ICON(PMARKER_SEL) DEF_ICON(PMARKER) @@ -581,56 +628,64 @@ DEF_ICON(MARKER_HLT) DEF_ICON(MARKER) DEF_ICON(SPACE2) // XXX DEF_ICON(SPACE3) // XXX -DEF_ICON(BLANK181) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK181) +#endif DEF_ICON(KEY_DEHLT) DEF_ICON(KEY_HLT) DEF_ICON(MUTE_IPO_OFF) DEF_ICON(MUTE_IPO_ON) -DEF_ICON(BLANK182) -DEF_ICON(BLANK183) -DEF_ICON(BLANK183b) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK182) + DEF_ICON(BLANK183) + DEF_ICON(BLANK183b) /* available */ -DEF_ICON(BLANK184) -DEF_ICON(BLANK185) -DEF_ICON(BLANK186) -DEF_ICON(BLANK187) -DEF_ICON(BLANK188) -DEF_ICON(BLANK189) -DEF_ICON(BLANK190) -DEF_ICON(BLANK191) -DEF_ICON(BLANK192) -DEF_ICON(BLANK193) -DEF_ICON(BLANK194) -DEF_ICON(BLANK195) -DEF_ICON(BLANK196) -DEF_ICON(BLANK197) -DEF_ICON(BLANK198) -DEF_ICON(BLANK199) -DEF_ICON(BLANK200) -DEF_ICON(BLANK201) -DEF_ICON(BLANK202) -DEF_ICON(BLANK203) -DEF_ICON(BLANK204) -DEF_ICON(BLANK205) -DEF_ICON(BLANK206) -DEF_ICON(BLANK207) -DEF_ICON(BLANK208) -DEF_ICON(BLANK208b) + DEF_ICON(BLANK184) + DEF_ICON(BLANK185) + DEF_ICON(BLANK186) + DEF_ICON(BLANK187) + DEF_ICON(BLANK188) + DEF_ICON(BLANK189) + DEF_ICON(BLANK190) + DEF_ICON(BLANK191) + DEF_ICON(BLANK192) + DEF_ICON(BLANK193) + DEF_ICON(BLANK194) + DEF_ICON(BLANK195) + DEF_ICON(BLANK196) + DEF_ICON(BLANK197) + DEF_ICON(BLANK198) + DEF_ICON(BLANK199) + DEF_ICON(BLANK200) + DEF_ICON(BLANK201) + DEF_ICON(BLANK202) + DEF_ICON(BLANK203) + DEF_ICON(BLANK204) + DEF_ICON(BLANK205) + DEF_ICON(BLANK206) + DEF_ICON(BLANK207) + DEF_ICON(BLANK208) + DEF_ICON(BLANK208b) +#endif /* EDITING */ DEF_ICON(VERTEXSEL) DEF_ICON(EDGESEL) DEF_ICON(FACESEL) -DEF_ICON(BLANK209) -DEF_ICON(BLANK210) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK209) + DEF_ICON(BLANK210) +#endif DEF_ICON(ROTATE) DEF_ICON(CURSOR) DEF_ICON(ROTATECOLLECTION) DEF_ICON(ROTATECENTER) DEF_ICON(ROTACTIVE) DEF_ICON(ALIGN) -DEF_ICON(BLANK211) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK211) +#endif DEF_ICON(SMOOTHCURVE) DEF_ICON(SPHERECURVE) DEF_ICON(ROOTCURVE) @@ -641,7 +696,9 @@ DEF_ICON(RNDCURVE) DEF_ICON(PROP_OFF) DEF_ICON(PROP_ON) DEF_ICON(PROP_CON) -DEF_ICON(BLANK212) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK212) +#endif DEF_ICON(PARTICLE_POINT) DEF_ICON(PARTICLE_TIP) DEF_ICON(PARTICLE_PATH) @@ -659,7 +716,9 @@ DEF_ICON(SNAP_VERTEX) DEF_ICON(SNAP_EDGE) DEF_ICON(SNAP_FACE) DEF_ICON(SNAP_VOLUME) -DEF_ICON(BLANK220) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK220) +#endif DEF_ICON(STICKY_UVS_LOC) DEF_ICON(STICKY_UVS_DISABLE) DEF_ICON(STICKY_UVS_VERT) @@ -667,40 +726,48 @@ DEF_ICON(CLIPUV_DEHLT) DEF_ICON(CLIPUV_HLT) DEF_ICON(SNAP_PEEL_OBJECT) DEF_ICON(GRID) -DEF_ICON(BLANK221) -DEF_ICON(BLANK222) -DEF_ICON(BLANK224) -DEF_ICON(BLANK225) -DEF_ICON(BLANK226) -DEF_ICON(BLANK226b) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK221) + DEF_ICON(BLANK222) + DEF_ICON(BLANK224) + DEF_ICON(BLANK225) + DEF_ICON(BLANK226) + DEF_ICON(BLANK226b) +#endif /* EDITING */ DEF_ICON(PASTEDOWN) DEF_ICON(COPYDOWN) DEF_ICON(PASTEFLIPUP) DEF_ICON(PASTEFLIPDOWN) -DEF_ICON(BLANK227) -DEF_ICON(BLANK228) -DEF_ICON(BLANK229) -DEF_ICON(BLANK230) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK227) + DEF_ICON(BLANK228) + DEF_ICON(BLANK229) + DEF_ICON(BLANK230) +#endif DEF_ICON(SNAP_SURFACE) -DEF_ICON(BLANK232) -DEF_ICON(BLANK233) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK232) + DEF_ICON(BLANK233) +#endif DEF_ICON(RETOPO) DEF_ICON(UV_VERTEXSEL) DEF_ICON(UV_EDGESEL) DEF_ICON(UV_FACESEL) DEF_ICON(UV_ISLANDSEL) DEF_ICON(UV_SYNC_SELECT) -DEF_ICON(BLANK240) -DEF_ICON(BLANK241) -DEF_ICON(BLANK242) -DEF_ICON(BLANK243) -DEF_ICON(BLANK244) -DEF_ICON(BLANK245) -DEF_ICON(BLANK246) -DEF_ICON(BLANK247) -DEF_ICON(BLANK247b) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK240) + DEF_ICON(BLANK241) + DEF_ICON(BLANK242) + DEF_ICON(BLANK243) + DEF_ICON(BLANK244) + DEF_ICON(BLANK245) + DEF_ICON(BLANK246) + DEF_ICON(BLANK247) + DEF_ICON(BLANK247b) +#endif /* 3D VIEW */ DEF_ICON(BBOX) @@ -708,13 +775,19 @@ DEF_ICON(WIRE) DEF_ICON(SOLID) DEF_ICON(SMOOTH) DEF_ICON(POTATO) -DEF_ICON(BLANK248) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK248) +#endif DEF_ICON(ORTHO) -DEF_ICON(BLANK249) -DEF_ICON(BLANK250) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK249) + DEF_ICON(BLANK250) +#endif DEF_ICON(LOCKVIEW_OFF) DEF_ICON(LOCKVIEW_ON) -DEF_ICON(BLANK251) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK251) +#endif DEF_ICON(AXIS_SIDE) DEF_ICON(AXIS_FRONT) DEF_ICON(AXIS_TOP) @@ -724,39 +797,41 @@ DEF_ICON(NDOF_FLY) DEF_ICON(NDOF_TRANS) DEF_ICON(LAYER_USED) DEF_ICON(LAYER_ACTIVE) -DEF_ICON(BLANK254) -DEF_ICON(BLANK255) -DEF_ICON(BLANK256) -DEF_ICON(BLANK257) -DEF_ICON(BLANK257b) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK254) + DEF_ICON(BLANK255) + DEF_ICON(BLANK256) + DEF_ICON(BLANK257) + DEF_ICON(BLANK257b) /* available */ -DEF_ICON(BLANK258) -DEF_ICON(BLANK259) -DEF_ICON(BLANK260) -DEF_ICON(BLANK261) -DEF_ICON(BLANK262) -DEF_ICON(BLANK263) -DEF_ICON(BLANK264) -DEF_ICON(BLANK265) -DEF_ICON(BLANK266) -DEF_ICON(BLANK267) -DEF_ICON(BLANK268) -DEF_ICON(BLANK269) -DEF_ICON(BLANK270) -DEF_ICON(BLANK271) -DEF_ICON(BLANK272) -DEF_ICON(BLANK273) -DEF_ICON(BLANK274) -DEF_ICON(BLANK275) -DEF_ICON(BLANK276) -DEF_ICON(BLANK277) -DEF_ICON(BLANK278) -DEF_ICON(BLANK279) -DEF_ICON(BLANK280) -DEF_ICON(BLANK281) -DEF_ICON(BLANK282) -DEF_ICON(BLANK282b) + DEF_ICON(BLANK258) + DEF_ICON(BLANK259) + DEF_ICON(BLANK260) + DEF_ICON(BLANK261) + DEF_ICON(BLANK262) + DEF_ICON(BLANK263) + DEF_ICON(BLANK264) + DEF_ICON(BLANK265) + DEF_ICON(BLANK266) + DEF_ICON(BLANK267) + DEF_ICON(BLANK268) + DEF_ICON(BLANK269) + DEF_ICON(BLANK270) + DEF_ICON(BLANK271) + DEF_ICON(BLANK272) + DEF_ICON(BLANK273) + DEF_ICON(BLANK274) + DEF_ICON(BLANK275) + DEF_ICON(BLANK276) + DEF_ICON(BLANK277) + DEF_ICON(BLANK278) + DEF_ICON(BLANK279) + DEF_ICON(BLANK280) + DEF_ICON(BLANK281) + DEF_ICON(BLANK282) + DEF_ICON(BLANK282b) +#endif /* FILE SELECT */ DEF_ICON(SORTALPHA) @@ -767,13 +842,17 @@ DEF_ICON(LONGDISPLAY) DEF_ICON(SHORTDISPLAY) DEF_ICON(GHOST) DEF_ICON(IMGDISPLAY) -DEF_ICON(BLANK284) -DEF_ICON(BLANK285) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK284) + DEF_ICON(BLANK285) +#endif DEF_ICON(BOOKMARKS) DEF_ICON(FONTPREVIEW) DEF_ICON(FILTER) DEF_ICON(NEWFOLDER) -DEF_ICON(BLANK285F) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK285F) +#endif DEF_ICON(FILE_PARENT) DEF_ICON(FILE_REFRESH) DEF_ICON(FILE_FOLDER) @@ -784,34 +863,38 @@ DEF_ICON(FILE_MOVIE) DEF_ICON(FILE_SCRIPT) DEF_ICON(FILE_SOUND) DEF_ICON(FILE_FONT) -DEF_ICON(BLANK291b) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK291b) /* available */ -DEF_ICON(BLANK292) -DEF_ICON(BLANK293) -DEF_ICON(BLANK294) -DEF_ICON(BLANK295) -DEF_ICON(BLANK296) -DEF_ICON(BLANK297) -DEF_ICON(BLANK298) -DEF_ICON(BLANK299) -DEF_ICON(BLANK300) -DEF_ICON(BLANK301) -DEF_ICON(BLANK302) -DEF_ICON(BLANK303) -DEF_ICON(BLANK304) -DEF_ICON(BLANK305) -DEF_ICON(BLANK306) + DEF_ICON(BLANK292) + DEF_ICON(BLANK293) + DEF_ICON(BLANK294) + DEF_ICON(BLANK295) + DEF_ICON(BLANK296) + DEF_ICON(BLANK297) + DEF_ICON(BLANK298) + DEF_ICON(BLANK299) + DEF_ICON(BLANK300) + DEF_ICON(BLANK301) + DEF_ICON(BLANK302) + DEF_ICON(BLANK303) + DEF_ICON(BLANK304) + DEF_ICON(BLANK305) + DEF_ICON(BLANK306) +#endif DEF_ICON(BACK) DEF_ICON(FORWARD) -DEF_ICON(BLANK309) -DEF_ICON(BLANK310) -DEF_ICON(BLANK311) -DEF_ICON(BLANK312) -DEF_ICON(BLANK313) -DEF_ICON(BLANK314) -DEF_ICON(BLANK315) -DEF_ICON(BLANK316) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK309) + DEF_ICON(BLANK310) + DEF_ICON(BLANK311) + DEF_ICON(BLANK312) + DEF_ICON(BLANK313) + DEF_ICON(BLANK314) + DEF_ICON(BLANK315) + DEF_ICON(BLANK316) +#endif DEF_ICON(DISK_DRIVE) /* SHADING / TEXT */ @@ -823,10 +906,12 @@ DEF_ICON(HAIR) DEF_ICON(ALIASED) DEF_ICON(ANTIALIASED) DEF_ICON(MAT_SPHERE_SKY) -DEF_ICON(BLANK319) -DEF_ICON(BLANK320) -DEF_ICON(BLANK321) -DEF_ICON(BLANK322) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK319) + DEF_ICON(BLANK320) + DEF_ICON(BLANK321) + DEF_ICON(BLANK322) +#endif DEF_ICON(WORDWRAP_OFF) DEF_ICON(WORDWRAP_ON) DEF_ICON(SYNTAX_OFF) @@ -834,13 +919,15 @@ DEF_ICON(SYNTAX_ON) DEF_ICON(LINENUMBERS_OFF) DEF_ICON(LINENUMBERS_ON) DEF_ICON(SCRIPTPLUGINS) // XXX CREATE NEW -DEF_ICON(BLANK323) -DEF_ICON(BLANK324) -DEF_ICON(BLANK325) -DEF_ICON(BLANK326) -DEF_ICON(BLANK327) -DEF_ICON(BLANK328) -DEF_ICON(BLANK328b) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK323) + DEF_ICON(BLANK324) + DEF_ICON(BLANK325) + DEF_ICON(BLANK326) + DEF_ICON(BLANK327) + DEF_ICON(BLANK328) + DEF_ICON(BLANK328b) +#endif /* SEQUENCE / IMAGE EDITOR */ DEF_ICON(SEQ_SEQUENCER) @@ -849,26 +936,30 @@ DEF_ICON(SEQ_LUMA_WAVEFORM) DEF_ICON(SEQ_CHROMA_SCOPE) DEF_ICON(SEQ_HISTOGRAM) DEF_ICON(SEQ_SPLITVIEW) -DEF_ICON(BLANK331) -DEF_ICON(BLANK332) -DEF_ICON(BLANK333) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK331) + DEF_ICON(BLANK332) + DEF_ICON(BLANK333) +#endif DEF_ICON(IMAGE_RGB) // XXX CHANGE TO STRAIGHT ALPHA, Z ETC DEF_ICON(IMAGE_RGB_ALPHA) DEF_ICON(IMAGE_ALPHA) DEF_ICON(IMAGE_ZDEPTH) DEF_ICON(IMAGEFILE) -DEF_ICON(BLANK336) -DEF_ICON(BLANK337) -DEF_ICON(BLANK338) -DEF_ICON(BLANK339) -DEF_ICON(BLANK340) -DEF_ICON(BLANK341) -DEF_ICON(BLANK342) -DEF_ICON(BLANK343) -DEF_ICON(BLANK344) -DEF_ICON(BLANK345) -DEF_ICON(BLANK346) -DEF_ICON(BLANK346b) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK336) + DEF_ICON(BLANK337) + DEF_ICON(BLANK338) + DEF_ICON(BLANK339) + DEF_ICON(BLANK340) + DEF_ICON(BLANK341) + DEF_ICON(BLANK342) + DEF_ICON(BLANK343) + DEF_ICON(BLANK344) + DEF_ICON(BLANK345) + DEF_ICON(BLANK346) + DEF_ICON(BLANK346b) +#endif /* brush icons */ diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 0e2eea0b942..009c7d29102 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -241,34 +241,30 @@ typedef struct SpaceImage { ListBase regionbase; /* storage of regions for inactive spaces */ int spacetype; - float blockscale; - short blockhandler[8]; - + int flag; + struct Image *image; struct ImageUser iuser; + struct CurveMapping *cumap; - struct CurveMapping *cumap; - short menunr, imanr, pad2; + struct Scopes scopes; /* histogram waveform and vectorscope */ + struct Histogram sample_line_hist; /* sample line histogram */ + + struct bGPdata *gpd; /* grease pencil data */ + + float cursor[2]; /* UV editor 2d cursor */ + float xof, yof; /* user defined offset, image is centered */ + float zoom; /* user defined zoom level */ + float centx, centy; /* storage for offset while render drawing */ + short curtile; /* the currently active tile of the image when tile is enabled, is kept in sync with the active faces tile */ - int flag; - short imtypenr, lock; - short pin, pad3; + short imtypenr; + short lock; + short pin; char dt_uv; /* UV draw type */ char sticky; /* sticky selection type */ char dt_uvstretch; char around; - float cursor[2]; /* UV editor 2d cursor */ - - float xof, yof; /* user defined offset, image is centered */ - float zoom, pad4; /* user defined zoom level */ - float centx, centy; /* storage for offset while render drawing */ - - struct bGPdata *gpd; /* grease pencil data */ - - struct Scopes scopes; /* histogram waveform and vectorscope */ - - struct Histogram sample_line_hist; /* sample line histogram */ - } SpaceImage; typedef struct SpaceNla { diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index dfecd016f45..2e4c6e5a7b7 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -65,12 +65,13 @@ static PointerRNA rna_uiItemO(uiLayout *layout, char *opname, char *name, int ic #else +#define DEF_ICON_BLANK_SKIP #define DEF_ICON(name) {ICON_##name, (#name), 0, (#name), ""}, #define DEF_VICO(name) {VICO_##name, (#name), 0, (#name), ""}, - static EnumPropertyItem icon_items[] = { #include "UI_icons.h" {0, NULL, 0, NULL, NULL}}; +#undef DEF_ICON_BLANK_SKIP #undef DEF_ICON #undef DEF_VICO |