Revision: 47900 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47900 Author: dingto Date: 2012-06-14 13:54:55 +0000 (Thu, 14 Jun 2012) Log Message: ----------- Bugfix for [#31829] Add lamp icons missing. Patch by Philipp Oeser.
Note: If you do code cleanups, and revert make sure you revert it correct and not halfway. ;-) r47034 Revision Links: -------------- http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47034 Modified Paths: -------------- trunk/blender/source/blender/editors/object/object_add.c Modified: trunk/blender/source/blender/editors/object/object_add.c =================================================================== --- trunk/blender/source/blender/editors/object/object_add.c 2012-06-14 13:48:04 UTC (rev 47899) +++ trunk/blender/source/blender/editors/object/object_add.c 2012-06-14 13:54:55 UTC (rev 47900) @@ -108,13 +108,14 @@ #include "object_intern.h" /* this is an exact copy of the define in rna_lamp.c - * kept here because of linking order */ + * kept here because of linking order. + * Icons are only defined here */ EnumPropertyItem lamp_type_items[] = { - {LA_LOCAL, "POINT", 0, "Point", "Omnidirectional point light source"}, - {LA_SUN, "SUN", 0, "Sun", "Constant direction parallel ray light source"}, - {LA_SPOT, "SPOT", 0, "Spot", "Directional cone light source"}, - {LA_HEMI, "HEMI", 0, "Hemi", "180 degree constant light source"}, - {LA_AREA, "AREA", 0, "Area", "Directional area light source"}, + {LA_LOCAL, "POINT", ICON_LAMP_POINT, "Point", "Omnidirectional point light source"}, + {LA_SUN, "SUN", ICON_LAMP_SUN, "Sun", "Constant direction parallel ray light source"}, + {LA_SPOT, "SPOT", ICON_LAMP_SPOT, "Spot", "Directional cone light source"}, + {LA_HEMI, "HEMI", ICON_LAMP_HEMI, "Hemi", "180 degree constant light source"}, + {LA_AREA, "AREA", ICON_LAMP_AREA, "Area", "Directional area light source"}, {0, NULL, 0, NULL, NULL} }; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs