diff options
Diffstat (limited to 'source')
32 files changed, 719 insertions, 645 deletions
diff --git a/source/blender/datatoc/datatoc_icon_split.py b/source/blender/datatoc/datatoc_icon_split.py index 87f3fdae478..44fedca4398 100755 --- a/source/blender/datatoc/datatoc_icon_split.py +++ b/source/blender/datatoc/datatoc_icon_split.py @@ -140,6 +140,7 @@ def dice_icon_name( if match: if l.find('DEF_ICON_BLANK') == -1: icon_name = match.group(1).lower() + print(icon_name) _dice_icon_name_cache[count] = icon_name count += 1 # ---- Done with icon cache diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 3e7f7063235..4e898d5654b 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -42,8 +42,8 @@ set(ICON_NAMES tria_up arrow_leftright plus - disclosure_tri_down disclosure_tri_right + disclosure_tri_down radiobut_off radiobut_on menu_panel @@ -58,12 +58,12 @@ set(ICON_NAMES node node_sel fullscreen - splitscreen + workspace rightarrow_thin bordermove viewzoom - zoomin - zoomout + add + remove panel_close copy_id eyedropper @@ -100,14 +100,16 @@ set(ICON_NAMES freeze stylus_pressure ghost_disabled - new + file_new file_tick quit url recover_last + 30 fullscreen_enter fullscreen_exit - lamp + #onionskin + light material texture anim @@ -121,27 +123,31 @@ set(ICON_NAMES physics speaker texture_shaded + tool_settings + shaderfx + #blank1 view3d - ipo - oops - buts - filesel - image_col + graph + outliner + properties + filebrowser + image info sequence text - imasel sound action nla - scriptwin + preferences time nodetree logic console - preferences clip asset_manager + node_compositing + node_texture + node_material object_datamode editmode_hlt facesel_hlt @@ -153,6 +159,15 @@ set(ICON_NAMES particlemode lightpaint greasepencil_stroke_paint + tracking + tracking_backwards + tracking_forwards + tracking_backwards_single + tracking_forwards_single + tracking_clear_backwards + tracking_clear_forwards + tracking_refine_backwards + tracking_refine_forwards scene_data renderlayers world_data @@ -161,7 +176,7 @@ set(ICON_NAMES curve_data meta_data lattice_data - lamp_data + light_data material_data texture_data anim_data @@ -186,7 +201,6 @@ set(ICON_NAMES render_result surface_data empty_data - settings render_animation render_still library_data_broken @@ -200,18 +214,36 @@ set(ICON_NAMES group_vertex group_vcol group_uvs + face_maps rna rna_add mouse_lmb mouse_mmb mouse_rmb - mouse_drag + mouse_move + mouse_lmb_drag + mouse_mmb_drag + mouse_rmb_drag + preset + decorate + decorate_keyframe + decorate_animate + decorate_driver + decorate_linked + decorate_override + decorate_unlocked + decorate_locked + fake_user + orphan_data + user + system + settings outliner_ob_empty outliner_ob_mesh outliner_ob_curve outliner_ob_lattice outliner_ob_meta - outliner_ob_lamp + outliner_ob_light outliner_ob_camera outliner_ob_armature outliner_ob_font @@ -220,6 +252,8 @@ set(ICON_NAMES outliner_ob_force_field outliner_ob_group_instance outliner_ob_greasepencil + outliner_ob_lightprobe + outliner_ob_image restrict_color_off restrict_color_on restrict_view_off @@ -228,12 +262,11 @@ set(ICON_NAMES restrict_select_on restrict_render_off restrict_render_on - outliner_data_empty outliner_data_mesh outliner_data_curve outliner_data_lattice outliner_data_meta - outliner_data_lamp + outliner_data_light outliner_data_camera outliner_data_armature outliner_data_font @@ -241,6 +274,10 @@ set(ICON_NAMES outliner_data_speaker outliner_data_pose outliner_data_greasepencil + onionskin_off + onionskin_on + hide_off + hide_on mesh_plane mesh_cube mesh_circle @@ -252,11 +289,11 @@ set(ICON_NAMES mesh_torus mesh_cone mesh_capsule - lamp_point - lamp_sun - lamp_spot - lamp_hemi - lamp_area + light_point + light_sun + light_spot + light_hemi + light_area meta_empty meta_plane meta_cube @@ -274,6 +311,9 @@ set(ICON_NAMES curve_ncurve curve_ncircle curve_path + lightprobe_cubemap + lightprobe_planar + lightprobe_grid color_red color_green color_blue @@ -294,8 +334,25 @@ set(ICON_NAMES force_turbulence force_drag force_smokeflow + temperature + gear node_insert_on node_insert_off + node_top + node_side + node_corner + align_left + align_center + align_right + align_justify + align_flush + align_top + align_middle + align_bottom + bold + italic + underline + small_caps modifier mod_wave mod_build @@ -346,7 +403,6 @@ set(ICON_NAMES pause prev_keyframe next_keyframe - play_audio play_reverse preview_range action_tweak @@ -355,8 +411,8 @@ set(ICON_NAMES pmarker marker_hlt marker - space2 - space3 + keyframe_hlt + keyframe keyingset key_dehlt key_hlt @@ -390,13 +446,12 @@ set(ICON_NAMES vertexsel edgesel facesel - loopsel - rotate - cursor - rotatecollection - rotatecenter - rotactive - align + pivot_boundbox + pivot_cursor + pivot_individual + pivot_median + pivot_active + center_only smoothcurve spherecurve rootcurve @@ -407,6 +462,7 @@ set(ICON_NAMES prop_off prop_on prop_con + sculpt_dyntopo particle_point particle_tip particle_path @@ -431,15 +487,19 @@ set(ICON_NAMES snap_peel_object grid object_origin + orientation_global + orientation_gimbal + orientation_local + orientation_normal + orientation_view pastedown copydown pasteflipup pasteflipdown vis_sel_11 vis_sel_10 - vis_sel_10 + vis_sel_01 vis_sel_00 - snap_surface automerge_on automerge_off retopo @@ -448,12 +508,16 @@ set(ICON_NAMES uv_facesel uv_islandsel uv_sync_select - bbox - wire - solid - smooth - potato - ortho + normals_vertex + normals_vertex_face + normals_face + shading_bbox + shading_wire + shading_solid + shading_rendered + shading_texture + overlay + xray lockview_off lockview_on axis_side @@ -473,8 +537,6 @@ set(ICON_NAMES shortdisplay ghost imgdisplay - save_as - save_copy bookmarks fontpreview filter @@ -483,6 +545,7 @@ set(ICON_NAMES file_parent file_refresh file_folder + file_blank file_blend file_image file_movie @@ -490,18 +553,19 @@ set(ICON_NAMES file_sound file_font file_text - recover_auto - save_prefs + sort_desc + sort_asc link_blend append_blend import export external_data - load_factory loop_back loop_forwards back forward + alembic + volume file_hidden file_backup disk_drive @@ -531,6 +595,11 @@ set(ICON_NAMES image_alpha image_zdepth imagefile + view_perspective + view_ortho + view_camera + view_pan + view_zoom ) # This section is maintained by the updating script, keep BEGIN/END comments. diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index eb4307b9f86..5eb1c07c253 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -393,7 +393,7 @@ const EnumPropertyItem *ED_gpencil_layers_with_new_enum_itemf( item_tmp.identifier = "__CREATE__"; item_tmp.name = "New Layer"; item_tmp.value = -1; - item_tmp.icon = ICON_ZOOMIN; + item_tmp.icon = ICON_ADD; RNA_enum_item_add(&item, &totitem, &item_tmp); /* separator */ diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 45cc1046932..68c2044f95c 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -28,93 +28,91 @@ * \ingroup editorui */ -/* Note: this is included twice with different #defines for DEF_ICON - * once from UI_resources.h for the internal icon enum and - * once for interface_api.c for the definition of the RNA enum for the icons */ +/* Note: this is included multiple times with different #defines for DEF_ICON. */ /* ICON_ prefix added */ -DEF_ICON(NONE) +DEF_ICON_COLOR(NONE) DEF_ICON(QUESTION) DEF_ICON(ERROR) DEF_ICON(CANCEL) -DEF_ICON_MONO(TRIA_RIGHT) -DEF_ICON_MONO(TRIA_DOWN) -DEF_ICON_MONO(TRIA_LEFT) -DEF_ICON_MONO(TRIA_UP) -DEF_ICON_MONO(ARROW_LEFTRIGHT) -DEF_ICON_MONO(PLUS) -DEF_ICON_MONO(DISCLOSURE_TRI_RIGHT) -DEF_ICON_MONO(DISCLOSURE_TRI_DOWN) -DEF_ICON_MONO(RADIOBUT_OFF) -DEF_ICON_MONO(RADIOBUT_ON) -DEF_ICON(MENU_PANEL) +DEF_ICON(TRIA_RIGHT) +DEF_ICON(TRIA_DOWN) +DEF_ICON(TRIA_LEFT) +DEF_ICON(TRIA_UP) +DEF_ICON(ARROW_LEFTRIGHT) +DEF_ICON(PLUS) +DEF_ICON(DISCLOSURE_TRI_RIGHT) +DEF_ICON(DISCLOSURE_TRI_DOWN) +DEF_ICON(RADIOBUT_OFF) +DEF_ICON(RADIOBUT_ON) +DEF_ICON_COLOR(MENU_PANEL) DEF_ICON(BLENDER) -DEF_ICON_MONO(GRIP) -DEF_ICON_MONO(DOT) -DEF_ICON_MONO(COLLAPSEMENU) -DEF_ICON_MONO(X) +DEF_ICON(GRIP) +DEF_ICON(DOT) +DEF_ICON(COLLAPSEMENU) +DEF_ICON(X) DEF_ICON_BLANK(5) /* XXX 'DOWNARROW' icon! */ -DEF_ICON(GO_LEFT) -DEF_ICON(PLUG) -DEF_ICON(UI) +DEF_ICON_COLOR(GO_LEFT) +DEF_ICON_COLOR(PLUG) +DEF_ICON_COLOR(UI) DEF_ICON(NODE) DEF_ICON(NODE_SEL) /* ui */ -DEF_ICON(FULLSCREEN) -DEF_ICON(SPLITSCREEN) -DEF_ICON_MONO(RIGHTARROW_THIN) -DEF_ICON_MONO(BORDERMOVE) -DEF_ICON_MONO(VIEWZOOM) -DEF_ICON_MONO(ZOOMIN) -DEF_ICON_MONO(ZOOMOUT) -DEF_ICON_MONO(PANEL_CLOSE) -DEF_ICON(COPY_ID) +DEF_ICON_COLOR(FULLSCREEN) +DEF_ICON(WORKSPACE) +DEF_ICON(RIGHTARROW_THIN) +DEF_ICON(BORDERMOVE) +DEF_ICON(VIEWZOOM) +DEF_ICON(ADD) +DEF_ICON(REMOVE) +DEF_ICON(PANEL_CLOSE) +DEF_ICON_COLOR(COPY_ID) DEF_ICON(EYEDROPPER) -DEF_ICON(LINK_AREA) +DEF_ICON_COLOR(LINK_AREA) DEF_ICON(AUTO) -DEF_ICON_MONO(CHECKBOX_DEHLT) -DEF_ICON_MONO(CHECKBOX_HLT) -DEF_ICON_MONO(UNLOCKED) -DEF_ICON_MONO(LOCKED) -DEF_ICON_MONO(UNPINNED) -DEF_ICON_MONO(PINNED) -DEF_ICON_MONO(SCREEN_BACK) -DEF_ICON_MONO(RIGHTARROW) -DEF_ICON_MONO(DOWNARROW_HLT) -DEF_ICON(DOTSUP) -DEF_ICON(DOTSDOWN) +DEF_ICON(CHECKBOX_DEHLT) +DEF_ICON(CHECKBOX_HLT) +DEF_ICON(UNLOCKED) +DEF_ICON(LOCKED) +DEF_ICON(UNPINNED) +DEF_ICON(PINNED) +DEF_ICON(SCREEN_BACK) +DEF_ICON(RIGHTARROW) +DEF_ICON(DOWNARROW_HLT) +DEF_ICON_COLOR(DOTSUP) +DEF_ICON_COLOR(DOTSDOWN) DEF_ICON(LINK) DEF_ICON(INLINK) -DEF_ICON(PLUGIN) +DEF_ICON_COLOR(PLUGIN) /* various ui */ DEF_ICON(HELP) DEF_ICON(GHOST_ENABLED) DEF_ICON(COLOR) /* see COLOR_RED/GREEN/BLUE */ -DEF_ICON_MONO(LINKED) -DEF_ICON_MONO(UNLINKED) -DEF_ICON_MONO(HAND) -DEF_ICON_MONO(ZOOM_ALL) -DEF_ICON_MONO(ZOOM_SELECTED) -DEF_ICON_MONO(ZOOM_PREVIOUS) -DEF_ICON_MONO(ZOOM_IN) -DEF_ICON_MONO(ZOOM_OUT) -DEF_ICON(RENDER_REGION) -DEF_ICON(BORDER_RECT) -DEF_ICON(BORDER_LASSO) +DEF_ICON(LINKED) +DEF_ICON(UNLINKED) +DEF_ICON(HAND) +DEF_ICON(ZOOM_ALL) +DEF_ICON(ZOOM_SELECTED) +DEF_ICON(ZOOM_PREVIOUS) +DEF_ICON(ZOOM_IN) +DEF_ICON(ZOOM_OUT) +DEF_ICON_COLOR(RENDER_REGION) +DEF_ICON_COLOR(BORDER_RECT) +DEF_ICON_COLOR(BORDER_LASSO) DEF_ICON(FREEZE) DEF_ICON(STYLUS_PRESSURE) DEF_ICON(GHOST_DISABLED) -DEF_ICON(NEW) +DEF_ICON(FILE_NEW) DEF_ICON(FILE_TICK) DEF_ICON(QUIT) DEF_ICON(URL) DEF_ICON(RECOVER_LAST) -DEF_ICON_BLANK(30) -DEF_ICON_MONO(FULLSCREEN_ENTER) -DEF_ICON_MONO(FULLSCREEN_EXIT) -DEF_ICON(BLANK1) // Not actually blank - this is used all over the place +DEF_ICON(30) +DEF_ICON(FULLSCREEN_ENTER) +DEF_ICON(FULLSCREEN_EXIT) +DEF_ICON(ONIONSKIN) /* BUTTONS */ DEF_ICON(LIGHT) @@ -126,7 +124,7 @@ DEF_ICON(SCENE) DEF_ICON(EDIT) DEF_ICON(GAME) DEF_ICON(RADIO) -DEF_ICON(SCRIPT) +DEF_ICON_COLOR(SCRIPT) DEF_ICON(PARTICLES) DEF_ICON(PHYSICS) DEF_ICON(SPEAKER) @@ -142,32 +140,32 @@ DEF_ICON_BLANK(49) DEF_ICON_BLANK(50) DEF_ICON_BLANK(51) DEF_ICON_BLANK(52) -DEF_ICON_BLANK(52b) +DEF_ICON_COLOR(BLANK1) // Not actually blank - this is used all over the place /* EDITORS */ DEF_ICON(VIEW3D) -DEF_ICON(IPO) -DEF_ICON(OOPS) -DEF_ICON(BUTS) -DEF_ICON(FILESEL) -DEF_ICON(IMAGE_COL) +DEF_ICON(GRAPH) +DEF_ICON(OUTLINER) +DEF_ICON(PROPERTIES) +DEF_ICON(FILEBROWSER) +DEF_ICON(IMAGE) DEF_ICON(INFO) DEF_ICON(SEQUENCE) DEF_ICON(TEXT) -DEF_ICON(IMASEL) +DEF_ICON_BLANK(62) DEF_ICON(SOUND) DEF_ICON(ACTION) DEF_ICON(NLA) -DEF_ICON(SCRIPTWIN) +DEF_ICON(PREFERENCES) DEF_ICON(TIME) DEF_ICON(NODETREE) DEF_ICON(LOGIC) DEF_ICON(CONSOLE) -DEF_ICON(PREFERENCES) +DEF_ICON_BLANK(54) DEF_ICON(CLIP) DEF_ICON(ASSET_MANAGER) -DEF_ICON_BLANK(57) -DEF_ICON_BLANK(58) -DEF_ICON_BLANK(59) +DEF_ICON(NODE_COMPOSITING) +DEF_ICON(NODE_TEXTURE) +DEF_ICON(NODE_MATERIAL) DEF_ICON_BLANK(60) DEF_ICON_BLANK(61) @@ -181,22 +179,22 @@ DEF_ICON(WPAINT_HLT) DEF_ICON(SCULPTMODE_HLT) DEF_ICON(POSE_HLT) DEF_ICON(PARTICLEMODE) -DEF_ICON(LIGHTPAINT) -DEF_ICON(GREASEPENCIL_STROKE_PAINT) +DEF_ICON_COLOR(LIGHTPAINT) +DEF_ICON_COLOR(GREASEPENCIL_STROKE_PAINT) DEF_ICON_BLANK(64) DEF_ICON_BLANK(65) DEF_ICON_BLANK(66) DEF_ICON_BLANK(67) DEF_ICON_BLANK(68) -DEF_ICON_BLANK(69) -DEF_ICON_BLANK(70) -DEF_ICON_BLANK(71) -DEF_ICON_BLANK(72) -DEF_ICON_BLANK(73) -DEF_ICON_BLANK(74) -DEF_ICON_BLANK(75) -DEF_ICON_BLANK(76) -DEF_ICON_BLANK(77) +DEF_ICON(TRACKING) +DEF_ICON(TRACKING_BACKWARDS) +DEF_ICON(TRACKING_FORWARDS) +DEF_ICON(TRACKING_BACKWARDS_SINGLE) +DEF_ICON(TRACKING_FORWARDS_SINGLE) +DEF_ICON(TRACKING_CLEAR_BACKWARDS) +DEF_ICON(TRACKING_CLEAR_FORWARDS) +DEF_ICON(TRACKING_REFINE_BACKWARDS) +DEF_ICON(TRACKING_REFINE_FORWARDS) DEF_ICON_BLANK(77b) /* DATA */ @@ -220,7 +218,7 @@ DEF_ICON(ARMATURE_DATA) DEF_ICON(POSE_DATA) DEF_ICON(BONE_DATA) DEF_ICON(CONSTRAINT) -DEF_ICON(SHAPEKEY_DATA) +DEF_ICON_COLOR(SHAPEKEY_DATA) DEF_ICON(CONSTRAINT_BONE) DEF_ICON(CAMERA_STEREO) DEF_ICON(PACKAGE) @@ -236,52 +234,52 @@ DEF_ICON(FONT_DATA) DEF_ICON(RENDER_RESULT) DEF_ICON(SURFACE_DATA) DEF_ICON(EMPTY_DATA) -DEF_ICON(SETTINGS) +DEF_ICON_BLANK(88) DEF_ICON(RENDER_ANIMATION) DEF_ICON(RENDER_STILL) DEF_ICON(LIBRARY_DATA_BROKEN) -DEF_ICON(BOIDS) +DEF_ICON_COLOR(BOIDS) DEF_ICON(STRANDS) DEF_ICON(LIBRARY_DATA_INDIRECT) DEF_ICON(GREASEPENCIL) DEF_ICON(LINE_DATA) -DEF_ICON(LIBRARY_DATA_OVERRIDE) +DEF_ICON_COLOR(LIBRARY_DATA_OVERRIDE) DEF_ICON(GROUP_BONE) DEF_ICON(GROUP_VERTEX) DEF_ICON(GROUP_VCOL) DEF_ICON(GROUP_UVS) -DEF_ICON_BLANK(89) +DEF_ICON(FACE_MAPS) DEF_ICON_BLANK(90) DEF_ICON(RNA) DEF_ICON(RNA_ADD) /* INPUT + DECORATOR */ -DEF_ICON_MONO(MOUSE_LMB) -DEF_ICON_MONO(MOUSE_MMB) -DEF_ICON_MONO(MOUSE_RMB) -DEF_ICON_MONO(MOUSE_MOVE) -DEF_ICON_MONO(MOUSE_LMB_DRAG) -DEF_ICON_MONO(MOUSE_MMB_DRAG) -DEF_ICON_MONO(MOUSE_RMB_DRAG) +DEF_ICON(MOUSE_LMB) +DEF_ICON(MOUSE_MMB) +DEF_ICON(MOUSE_RMB) +DEF_ICON(MOUSE_MOVE) +DEF_ICON(MOUSE_LMB_DRAG) +DEF_ICON(MOUSE_MMB_DRAG) +DEF_ICON(MOUSE_RMB_DRAG) DEF_ICON_BLANK(99) -DEF_ICON_MONO(PRESET) +DEF_ICON(PRESET) DEF_ICON_BLANK(101) -DEF_ICON_MONO(DECORATE) -DEF_ICON_MONO(DECORATE_KEYFRAME) -DEF_ICON_MONO(DECORATE_ANIMATE) -DEF_ICON_MONO(DECORATE_DRIVER) -DEF_ICON_MONO(DECORATE_LINKED) -DEF_ICON_MONO(DECORATE_OVERRIDE) -DEF_ICON_MONO(DECORATE_UNLOCKED) -DEF_ICON_MONO(DECORATE_LOCKED) +DEF_ICON(DECORATE) +DEF_ICON(DECORATE_KEYFRAME) +DEF_ICON(DECORATE_ANIMATE) +DEF_ICON(DECORATE_DRIVER) +DEF_ICON(DECORATE_LINKED) +DEF_ICON(DECORATE_OVERRIDE) +DEF_ICON(DECORATE_UNLOCKED) +DEF_ICON(DECORATE_LOCKED) DEF_ICON_BLANK(110) DEF_ICON_BLANK(111) DEF_ICON_BLANK(112) -DEF_ICON_BLANK(113) -DEF_ICON_BLANK(114) -DEF_ICON_MONO(USER) -DEF_ICON_BLANK(116) -DEF_ICON_BLANK(116b) +DEF_ICON(FAKE_USER) +DEF_ICON(ORPHAN_DATA) +DEF_ICON(USER) +DEF_ICON(SYSTEM) +DEF_ICON(SETTINGS) /* OUTLINER */ DEF_ICON(OUTLINER_OB_EMPTY) @@ -303,16 +301,16 @@ DEF_ICON(OUTLINER_OB_IMAGE) DEF_ICON_BLANK(125) DEF_ICON(RESTRICT_COLOR_OFF) DEF_ICON(RESTRICT_COLOR_ON) -DEF_ICON_MONO(HIDE_OFF) -DEF_ICON_MONO(HIDE_ON) -DEF_ICON_MONO(RESTRICT_SELECT_OFF) -DEF_ICON_MONO(RESTRICT_SELECT_ON) -DEF_ICON_MONO(RESTRICT_RENDER_OFF) -DEF_ICON_MONO(RESTRICT_RENDER_ON) +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_BLANK(127b) /* OUTLINER */ -DEF_ICON(OUTLINER_DATA_EMPTY) +DEF_ICON_BLANK(128) DEF_ICON(OUTLINER_DATA_MESH) DEF_ICON(OUTLINER_DATA_CURVE) DEF_ICON(OUTLINER_DATA_LATTICE) @@ -324,8 +322,8 @@ DEF_ICON(OUTLINER_DATA_FONT) DEF_ICON(OUTLINER_DATA_SURFACE) DEF_ICON(OUTLINER_DATA_SPEAKER) DEF_ICON(OUTLINER_DATA_POSE) +DEF_ICON_BLANK(130) DEF_ICON(OUTLINER_DATA_GREASEPENCIL) -DEF_ICON_BLANK(131) DEF_ICON_BLANK(132) DEF_ICON_BLANK(133) DEF_ICON_BLANK(134) @@ -333,10 +331,10 @@ DEF_ICON_BLANK(135) DEF_ICON_BLANK(136) DEF_ICON_BLANK(137) DEF_ICON_BLANK(138) -DEF_ICON_BLANK(139) -DEF_ICON_BLANK(140) -DEF_ICON_MONO(RESTRICT_VIEW_OFF) -DEF_ICON_MONO(RESTRICT_VIEW_ON) +DEF_ICON(ONIONSKIN_OFF) +DEF_ICON(ONIONSKIN_ON) +DEF_ICON(HIDE_OFF) +DEF_ICON(HIDE_ON) DEF_ICON_BLANK(142b) /* PRIMITIVES */ @@ -359,7 +357,7 @@ DEF_ICON(LIGHT_HEMI) DEF_ICON(LIGHT_AREA) DEF_ICON_BLANK(617) DEF_ICON_BLANK(618) -DEF_ICON(META_EMPTY) +DEF_ICON_COLOR(META_EMPTY) DEF_ICON(META_PLANE) DEF_ICON(META_CUBE) DEF_ICON(META_BALL) @@ -390,25 +388,25 @@ DEF_ICON_BLANK(648) DEF_ICON(COLOR_RED) DEF_ICON(COLOR_GREEN) DEF_ICON(COLOR_BLUE) -DEF_ICON_MONO(TRIA_RIGHT_BAR) -DEF_ICON_MONO(TRIA_DOWN_BAR) -DEF_ICON_MONO(TRIA_LEFT_BAR) -DEF_ICON_MONO(TRIA_UP_BAR) +DEF_ICON(TRIA_RIGHT_BAR) +DEF_ICON(TRIA_DOWN_BAR) +DEF_ICON(TRIA_LEFT_BAR) +DEF_ICON(TRIA_UP_BAR) /* EMPTY */ -DEF_ICON(FORCE_FORCE) -DEF_ICON(FORCE_WIND) -DEF_ICON(FORCE_VORTEX) -DEF_ICON(FORCE_MAGNETIC) -DEF_ICON(FORCE_HARMONIC) -DEF_ICON(FORCE_CHARGE) -DEF_ICON(FORCE_LENNARDJONES) -DEF_ICON(FORCE_TEXTURE) -DEF_ICON(FORCE_CURVE) -DEF_ICON(FORCE_BOID) -DEF_ICON(FORCE_TURBULENCE) -DEF_ICON(FORCE_DRAG) -DEF_ICON(FORCE_SMOKEFLOW) +DEF_ICON_COLOR(FORCE_FORCE) +DEF_ICON_COLOR(FORCE_WIND) +DEF_ICON_COLOR(FORCE_VORTEX) +DEF_ICON_COLOR(FORCE_MAGNETIC) +DEF_ICON_COLOR(FORCE_HARMONIC) +DEF_ICON_COLOR(FORCE_CHARGE) +DEF_ICON_COLOR(FORCE_LENNARDJONES) +DEF_ICON_COLOR(FORCE_TEXTURE) +DEF_ICON_COLOR(FORCE_CURVE) +DEF_ICON_COLOR(FORCE_BOID) +DEF_ICON_COLOR(FORCE_TURBULENCE) +DEF_ICON_COLOR(FORCE_DRAG) +DEF_ICON_COLOR(FORCE_SMOKEFLOW) DEF_ICON_BLANK(673) DEF_ICON_BLANK(674) DEF_ICON_BLANK(675) @@ -424,14 +422,14 @@ DEF_ICON_BLANK(684) DEF_ICON_BLANK(685) /* EMPTY */ -DEF_ICON_BLANK(690) /* XXX 'Temperature' icon! */ +DEF_ICON_COLOR(TEMPERATURE) /* XXX 'Temperature' icon! */ DEF_ICON_BLANK(691) /* XXX 'Temperature' icon! */ -DEF_ICON_BLANK(692) /* XXX 'Gear' icon! */ +DEF_ICON_COLOR(GEAR) /* XXX 'Gear' icon! */ DEF_ICON(NODE_INSERT_ON) DEF_ICON(NODE_INSERT_OFF) -DEF_ICON_BLANK(695) -DEF_ICON_BLANK(696) -DEF_ICON_BLANK(697) +DEF_ICON(NODE_TOP) +DEF_ICON(NODE_SIDE) +DEF_ICON(NODE_CORNER) DEF_ICON_BLANK(698) DEF_ICON_BLANK(699) DEF_ICON_BLANK(700) @@ -452,19 +450,19 @@ DEF_ICON_BLANK(714) DEF_ICON_BLANK(715) /* EMPTY */ -DEF_ICON_MONO(ALIGN_LEFT) -DEF_ICON_MONO(ALIGN_CENTER) -DEF_ICON_MONO(ALIGN_RIGHT) -DEF_ICON_MONO(ALIGN_JUSTIFY) -DEF_ICON_MONO(ALIGN_FLUSH) -DEF_ICON_MONO(ALIGN_TOP) -DEF_ICON_MONO(ALIGN_MIDDLE) -DEF_ICON_MONO(ALIGN_BOTTOM) -DEF_ICON_MONO(BOLD) -DEF_ICON_MONO(ITALIC) -DEF_ICON_MONO(UNDERLINE) -DEF_ICON_MONO(SMALL_CAPS_ON) -DEF_ICON_MONO(SMALL_CAPS_OFF) +DEF_ICON(ALIGN_LEFT) +DEF_ICON(ALIGN_CENTER) +DEF_ICON(ALIGN_RIGHT) +DEF_ICON(ALIGN_JUSTIFY) +DEF_ICON(ALIGN_FLUSH) +DEF_ICON(ALIGN_TOP) +DEF_ICON(ALIGN_MIDDLE) +DEF_ICON(ALIGN_BOTTOM) +DEF_ICON(BOLD) +DEF_ICON(ITALIC) +DEF_ICON(UNDERLINE) +DEF_ICON(SMALL_CAPS) +DEF_ICON_BLANK(742) DEF_ICON_BLANK(743) DEF_ICON_BLANK(744) DEF_ICON_BLANK(745) @@ -509,50 +507,50 @@ DEF_ICON_BLANK(785) /* MODIFIERS */ DEF_ICON(MODIFIER) -DEF_ICON(MOD_WAVE) -DEF_ICON(MOD_BUILD) -DEF_ICON(MOD_DECIM) -DEF_ICON(MOD_MIRROR) -DEF_ICON(MOD_SOFT) -DEF_ICON(MOD_SUBSURF) -DEF_ICON(HOOK) -DEF_ICON(MOD_PHYSICS) -DEF_ICON(MOD_PARTICLES) -DEF_ICON(MOD_BOOLEAN) -DEF_ICON(MOD_EDGESPLIT) -DEF_ICON(MOD_ARRAY) -DEF_ICON(MOD_UVPROJECT) -DEF_ICON(MOD_DISPLACE) -DEF_ICON(MOD_CURVE) -DEF_ICON(MOD_LATTICE) -DEF_ICON(CONSTRAINT_DATA) -DEF_ICON(MOD_ARMATURE) -DEF_ICON(MOD_SHRINKWRAP) -DEF_ICON(MOD_CAST) -DEF_ICON(MOD_MESHDEFORM) -DEF_ICON(MOD_BEVEL) -DEF_ICON(MOD_SMOOTH) -DEF_ICON(MOD_SIMPLEDEFORM) -DEF_ICON(MOD_MASK) +DEF_ICON_COLOR(MOD_WAVE) +DEF_ICON_COLOR(MOD_BUILD) +DEF_ICON_COLOR(MOD_DECIM) +DEF_ICON_COLOR(MOD_MIRROR) +DEF_ICON_COLOR(MOD_SOFT) +DEF_ICON_COLOR(MOD_SUBSURF) +DEF_ICON_COLOR(HOOK) +DEF_ICON_COLOR(MOD_PHYSICS) +DEF_ICON_COLOR(MOD_PARTICLES) +DEF_ICON_COLOR(MOD_BOOLEAN) +DEF_ICON_COLOR(MOD_EDGESPLIT) +DEF_ICON_COLOR(MOD_ARRAY) +DEF_ICON_COLOR(MOD_UVPROJECT) +DEF_ICON_COLOR(MOD_DISPLACE) +DEF_ICON_COLOR(MOD_CURVE) +DEF_ICON_COLOR(MOD_LATTICE) +DEF_ICON_COLOR(CONSTRAINT_DATA) +DEF_ICON_COLOR(MOD_ARMATURE) +DEF_ICON_COLOR(MOD_SHRINKWRAP) +DEF_ICON_COLOR(MOD_CAST) +DEF_ICON_COLOR(MOD_MESHDEFORM) +DEF_ICON_COLOR(MOD_BEVEL) +DEF_ICON_COLOR(MOD_SMOOTH) +DEF_ICON_COLOR(MOD_SIMPLEDEFORM) +DEF_ICON_COLOR(MOD_MASK) /* MODIFIERS */ -DEF_ICON(MOD_CLOTH) -DEF_ICON(MOD_EXPLODE) -DEF_ICON(MOD_FLUIDSIM) -DEF_ICON(MOD_MULTIRES) -DEF_ICON(MOD_SMOKE) -DEF_ICON(MOD_SOLIDIFY) -DEF_ICON(MOD_SCREW) -DEF_ICON(MOD_VERTEX_WEIGHT) -DEF_ICON(MOD_DYNAMICPAINT) -DEF_ICON(MOD_REMESH) -DEF_ICON(MOD_OCEAN) -DEF_ICON(MOD_WARP) -DEF_ICON(MOD_SKIN) -DEF_ICON(MOD_TRIANGULATE) -DEF_ICON(MOD_WIREFRAME) -DEF_ICON(MOD_DATA_TRANSFER) -DEF_ICON(MOD_NORMALEDIT) +DEF_ICON_COLOR(MOD_CLOTH) +DEF_ICON_COLOR(MOD_EXPLODE) +DEF_ICON_COLOR(MOD_FLUIDSIM) +DEF_ICON_COLOR(MOD_MULTIRES) +DEF_ICON_COLOR(MOD_SMOKE) +DEF_ICON_COLOR(MOD_SOLIDIFY) +DEF_ICON_COLOR(MOD_SCREW) +DEF_ICON_COLOR(MOD_VERTEX_WEIGHT) +DEF_ICON_COLOR(MOD_DYNAMICPAINT) +DEF_ICON_COLOR(MOD_REMESH) +DEF_ICON_COLOR(MOD_OCEAN) +DEF_ICON_COLOR(MOD_WARP) +DEF_ICON_COLOR(MOD_SKIN) +DEF_ICON_COLOR(MOD_TRIANGULATE) +DEF_ICON_COLOR(MOD_WIREFRAME) +DEF_ICON_COLOR(MOD_DATA_TRANSFER) +DEF_ICON_COLOR(MOD_NORMALEDIT) DEF_ICON_BLANK(169) DEF_ICON_BLANK(170) DEF_ICON_BLANK(171) @@ -564,24 +562,24 @@ DEF_ICON_BLANK(176) DEF_ICON_BLANK(177) /* ANIMATION */ -DEF_ICON_MONO(REC) -DEF_ICON_MONO(PLAY) -DEF_ICON_MONO(FF) -DEF_ICON_MONO(REW) -DEF_ICON_MONO(PAUSE) -DEF_ICON_MONO(PREV_KEYFRAME) -DEF_ICON_MONO(NEXT_KEYFRAME) +DEF_ICON(REC) +DEF_ICON(PLAY) +DEF_ICON(FF) +DEF_ICON(REW) +DEF_ICON(PAUSE) +DEF_ICON(PREV_KEYFRAME) +DEF_ICON(NEXT_KEYFRAME) DEF_ICON_BLANK(185) -DEF_ICON_MONO(PLAY_REVERSE) +DEF_ICON(PLAY_REVERSE) DEF_ICON(PREVIEW_RANGE) DEF_ICON(ACTION_TWEAK) DEF_ICON(PMARKER_ACT) DEF_ICON(PMARKER_SEL) -DEF_ICON(PMARKER) +DEF_ICON_COLOR(PMARKER) DEF_ICON(MARKER_HLT) DEF_ICON(MARKER) -DEF_ICON(SPACE2) // XXX -DEF_ICON(SPACE3) // XXX +DEF_ICON(KEYFRAME_HLT) +DEF_ICON(KEYFRAME) DEF_ICON(KEYINGSET) DEF_ICON(KEY_DEHLT) DEF_ICON(KEY_HLT) @@ -594,8 +592,8 @@ DEF_ICON(DRIVER) /* ANIMATION */ DEF_ICON(SOLO_OFF) DEF_ICON(SOLO_ON) -DEF_ICON_MONO(FRAME_PREV) -DEF_ICON_MONO(FRAME_NEXT) +DEF_ICON(FRAME_PREV) +DEF_ICON(FRAME_NEXT) DEF_ICON(NLA_PUSHDOWN) DEF_ICON(IPO_CONSTANT) DEF_ICON(IPO_LINEAR) @@ -614,7 +612,6 @@ DEF_ICON(IPO_EASE_IN) DEF_ICON(IPO_EASE_OUT) DEF_ICON(IPO_EASE_IN_OUT) DEF_ICON(NORMALIZE_FCURVES) - /* available */ DEF_ICON_BLANK(204) DEF_ICON_BLANK(205) DEF_ICON_BLANK(206) @@ -624,14 +621,14 @@ DEF_ICON_BLANK(207) DEF_ICON(VERTEXSEL) DEF_ICON(EDGESEL) DEF_ICON(FACESEL) -DEF_ICON(LOOPSEL) +DEF_ICON_BLANK(209) DEF_ICON_BLANK(210) -DEF_ICON(ROTATE) -DEF_ICON(CURSOR) -DEF_ICON(ROTATECOLLECTION) -DEF_ICON(ROTATECENTER) -DEF_ICON(ROTACTIVE) -DEF_ICON(ALIGN) +DEF_ICON(PIVOT_BOUNDBOX) +DEF_ICON(PIVOT_CURSOR) +DEF_ICON(PIVOT_INDIVIDUAL) +DEF_ICON(PIVOT_MEDIAN) +DEF_ICON(PIVOT_ACTIVE) +DEF_ICON(CENTER_ONLY) DEF_ICON_BLANK(211) DEF_ICON(SMOOTHCURVE) DEF_ICON(SPHERECURVE) @@ -649,10 +646,10 @@ DEF_ICON(PARTICLE_TIP) DEF_ICON(PARTICLE_PATH) /* EDITING */ -DEF_ICON(MAN_TRANS) -DEF_ICON(MAN_ROT) -DEF_ICON(MAN_SCALE) -DEF_ICON(MANIPUL) +DEF_ICON_COLOR(MAN_TRANS) +DEF_ICON_COLOR(MAN_ROT) +DEF_ICON_COLOR(MAN_SCALE) +DEF_ICON_COLOR(MANIPUL) DEF_ICON(SNAP_OFF) DEF_ICON(SNAP_ON) DEF_ICON(SNAP_NORMAL) @@ -670,11 +667,11 @@ DEF_ICON(CLIPUV_HLT) DEF_ICON(SNAP_PEEL_OBJECT) DEF_ICON(GRID) DEF_ICON(OBJECT_ORIGIN) -DEF_ICON_BLANK(222) -DEF_ICON_BLANK(224) -DEF_ICON_BLANK(225) -DEF_ICON_BLANK(226) -DEF_ICON_BLANK(226b) +DEF_ICON(ORIENTATION_GLOBAL) +DEF_ICON(ORIENTATION_GIMBAL) +DEF_ICON(ORIENTATION_LOCAL) +DEF_ICON(ORIENTATION_NORMAL) +DEF_ICON(ORIENTATION_VIEW) /* EDITING */ DEF_ICON(PASTEDOWN) @@ -685,10 +682,10 @@ DEF_ICON(VIS_SEL_11) DEF_ICON(VIS_SEL_10) DEF_ICON(VIS_SEL_01) DEF_ICON(VIS_SEL_00) -DEF_ICON(SNAP_SURFACE) +DEF_ICON_BLANK(231) DEF_ICON(AUTOMERGE_ON) DEF_ICON(AUTOMERGE_OFF) -DEF_ICON(RETOPO) +DEF_ICON_COLOR(RETOPO) DEF_ICON(UV_VERTEXSEL) DEF_ICON(UV_EDGESEL) DEF_ICON(UV_FACESEL) @@ -700,18 +697,18 @@ DEF_ICON_BLANK(242) DEF_ICON_BLANK(243) DEF_ICON_BLANK(244) DEF_ICON_BLANK(245) -DEF_ICON_BLANK(246) -DEF_ICON_BLANK(247) -DEF_ICON_BLANK(247b) +DEF_ICON(NORMALS_VERTEX) +DEF_ICON(NORMALS_VERTEX_FACE) +DEF_ICON(NORMALS_FACE) /* 3D VIEW */ -DEF_ICON(BBOX) -DEF_ICON(WIRE) -DEF_ICON(SOLID) -DEF_ICON(SMOOTH) -DEF_ICON(POTATO) +DEF_ICON(SHADING_BBOX) +DEF_ICON(SHADING_WIRE) +DEF_ICON(SHADING_SOLID) +DEF_ICON(SHADING_RENDERED) +DEF_ICON(SHADING_TEXTURE) DEF_ICON(OVERLAY) -DEF_ICON(ORTHO) +DEF_ICON(XRAY) DEF_ICON_BLANK(249) DEF_ICON_BLANK(250) DEF_ICON(LOCKVIEW_OFF) @@ -766,17 +763,17 @@ DEF_ICON(SORTTIME) DEF_ICON(SORTSIZE) DEF_ICON(LONGDISPLAY) DEF_ICON(SHORTDISPLAY) -DEF_ICON(GHOST) -DEF_ICON(IMGDISPLAY) -DEF_ICON(SAVE_AS) -DEF_ICON(SAVE_COPY) +DEF_ICON_COLOR(GHOST) +DEF_ICON_COLOR(IMGDISPLAY) +DEF_ICON_BLANK(292) +DEF_ICON_BLANK(293) DEF_ICON(BOOKMARKS) DEF_ICON(FONTPREVIEW) DEF_ICON(FILTER) DEF_ICON(NEWFOLDER) DEF_ICON(OPEN_RECENT) -DEF_ICON_MONO(FILE_PARENT) -DEF_ICON_MONO(FILE_REFRESH) +DEF_ICON(FILE_PARENT) +DEF_ICON(FILE_REFRESH) DEF_ICON(FILE_FOLDER) DEF_ICON(FILE_BLANK) DEF_ICON(FILE_BLEND) @@ -788,29 +785,29 @@ DEF_ICON(FILE_FONT) DEF_ICON(FILE_TEXT) /* FILE SELECT */ -DEF_ICON_MONO(RECOVER_AUTO) -DEF_ICON_MONO(SAVE_PREFS) -DEF_ICON_MONO(LINK_BLEND) -DEF_ICON_MONO(APPEND_BLEND) -DEF_ICON_MONO(IMPORT) -DEF_ICON_MONO(EXPORT) -DEF_ICON(EXTERNAL_DATA) -DEF_ICON(LOAD_FACTORY) +DEF_ICON(SORT_DESC) +DEF_ICON(SORT_ASC) +DEF_ICON(LINK_BLEND) +DEF_ICON(APPEND_BLEND) +DEF_ICON(IMPORT) +DEF_ICON(EXPORT) +DEF_ICON_COLOR(EXTERNAL_DATA) +DEF_ICON_BLANK(299) DEF_ICON_BLANK(300) DEF_ICON_BLANK(301) DEF_ICON_BLANK(302) DEF_ICON_BLANK(303) DEF_ICON_BLANK(304) -DEF_ICON_MONO(LOOP_BACK) -DEF_ICON_MONO(LOOP_FORWARDS) -DEF_ICON_MONO(BACK) -DEF_ICON_MONO(FORWARD) +DEF_ICON(LOOP_BACK) +DEF_ICON(LOOP_FORWARDS) +DEF_ICON(BACK) +DEF_ICON(FORWARD) DEF_ICON_BLANK(309) DEF_ICON_BLANK(310) DEF_ICON_BLANK(311) DEF_ICON_BLANK(312) -DEF_ICON_BLANK(313) -DEF_ICON_BLANK(314) +DEF_ICON(ALEMBIC) +DEF_ICON(VOLUME) DEF_ICON(FILE_HIDDEN) DEF_ICON(FILE_BACKUP) DEF_ICON(DISK_DRIVE) @@ -857,7 +854,7 @@ 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_COLOR(IMAGEFILE) DEF_ICON_BLANK(336) DEF_ICON_BLANK(337) DEF_ICON_BLANK(338) @@ -873,88 +870,88 @@ DEF_ICON(VIEW_ZOOM) /* brush icons */ -DEF_ICON(BRUSH_ADD) -DEF_ICON(BRUSH_BLOB) -DEF_ICON(BRUSH_BLUR) -DEF_ICON(BRUSH_CLAY) -DEF_ICON(BRUSH_CLAY_STRIPS) -DEF_ICON(BRUSH_CLONE) -DEF_ICON(BRUSH_CREASE) -DEF_ICON(BRUSH_DARKEN) -DEF_ICON(BRUSH_FILL) -DEF_ICON(BRUSH_FLATTEN) -DEF_ICON(BRUSH_GRAB) -DEF_ICON(BRUSH_INFLATE) -DEF_ICON(BRUSH_LAYER) -DEF_ICON(BRUSH_LIGHTEN) -DEF_ICON(BRUSH_MASK) -DEF_ICON(BRUSH_MIX) -DEF_ICON(BRUSH_MULTIPLY) -DEF_ICON(BRUSH_NUDGE) -DEF_ICON(BRUSH_PINCH) -DEF_ICON(BRUSH_SCRAPE) -DEF_ICON(BRUSH_SCULPT_DRAW) -DEF_ICON(BRUSH_SMEAR) -DEF_ICON(BRUSH_SMOOTH) -DEF_ICON(BRUSH_SNAKE_HOOK) -DEF_ICON(BRUSH_SOFTEN) -DEF_ICON(BRUSH_SUBTRACT) -DEF_ICON(BRUSH_TEXDRAW) -DEF_ICON(BRUSH_TEXFILL) -DEF_ICON(BRUSH_TEXMASK) -DEF_ICON(BRUSH_THUMB) -DEF_ICON(BRUSH_ROTATE) -DEF_ICON(BRUSH_VERTEXDRAW) +DEF_ICON_COLOR(BRUSH_ADD) +DEF_ICON_COLOR(BRUSH_BLOB) +DEF_ICON_COLOR(BRUSH_BLUR) +DEF_ICON_COLOR(BRUSH_CLAY) +DEF_ICON_COLOR(BRUSH_CLAY_STRIPS) +DEF_ICON_COLOR(BRUSH_CLONE) +DEF_ICON_COLOR(BRUSH_CREASE) +DEF_ICON_COLOR(BRUSH_DARKEN) +DEF_ICON_COLOR(BRUSH_FILL) +DEF_ICON_COLOR(BRUSH_FLATTEN) +DEF_ICON_COLOR(BRUSH_GRAB) +DEF_ICON_COLOR(BRUSH_INFLATE) +DEF_ICON_COLOR(BRUSH_LAYER) +DEF_ICON_COLOR(BRUSH_LIGHTEN) +DEF_ICON_COLOR(BRUSH_MASK) +DEF_ICON_COLOR(BRUSH_MIX) +DEF_ICON_COLOR(BRUSH_MULTIPLY) +DEF_ICON_COLOR(BRUSH_NUDGE) +DEF_ICON_COLOR(BRUSH_PINCH) +DEF_ICON_COLOR(BRUSH_SCRAPE) +DEF_ICON_COLOR(BRUSH_SCULPT_DRAW) +DEF_ICON_COLOR(BRUSH_SMEAR) +DEF_ICON_COLOR(BRUSH_SMOOTH) +DEF_ICON_COLOR(BRUSH_SNAKE_HOOK) +DEF_ICON_COLOR(BRUSH_SOFTEN) +DEF_ICON_COLOR(BRUSH_SUBTRACT) +DEF_ICON_COLOR(BRUSH_TEXDRAW) +DEF_ICON_COLOR(BRUSH_TEXFILL) +DEF_ICON_COLOR(BRUSH_TEXMASK) +DEF_ICON_COLOR(BRUSH_THUMB) +DEF_ICON_COLOR(BRUSH_ROTATE) +DEF_ICON_COLOR(BRUSH_VERTEXDRAW) /* Matcaps */ -DEF_ICON(MATCAP_01) -DEF_ICON(MATCAP_02) -DEF_ICON(MATCAP_03) -DEF_ICON(MATCAP_04) -DEF_ICON(MATCAP_05) -DEF_ICON(MATCAP_06) -DEF_ICON(MATCAP_07) -DEF_ICON(MATCAP_08) -DEF_ICON(MATCAP_09) -DEF_ICON(MATCAP_10) -DEF_ICON(MATCAP_11) -DEF_ICON(MATCAP_12) -DEF_ICON(MATCAP_13) -DEF_ICON(MATCAP_14) -DEF_ICON(MATCAP_15) -DEF_ICON(MATCAP_16) -DEF_ICON(MATCAP_17) -DEF_ICON(MATCAP_18) -DEF_ICON(MATCAP_19) -DEF_ICON(MATCAP_20) -DEF_ICON(MATCAP_21) -DEF_ICON(MATCAP_22) -DEF_ICON(MATCAP_23) -DEF_ICON(MATCAP_24) +DEF_ICON_COLOR(MATCAP_01) +DEF_ICON_COLOR(MATCAP_02) +DEF_ICON_COLOR(MATCAP_03) +DEF_ICON_COLOR(MATCAP_04) +DEF_ICON_COLOR(MATCAP_05) +DEF_ICON_COLOR(MATCAP_06) +DEF_ICON_COLOR(MATCAP_07) +DEF_ICON_COLOR(MATCAP_08) +DEF_ICON_COLOR(MATCAP_09) +DEF_ICON_COLOR(MATCAP_10) +DEF_ICON_COLOR(MATCAP_11) +DEF_ICON_COLOR(MATCAP_12) +DEF_ICON_COLOR(MATCAP_13) +DEF_ICON_COLOR(MATCAP_14) +DEF_ICON_COLOR(MATCAP_15) +DEF_ICON_COLOR(MATCAP_16) +DEF_ICON_COLOR(MATCAP_17) +DEF_ICON_COLOR(MATCAP_18) +DEF_ICON_COLOR(MATCAP_19) +DEF_ICON_COLOR(MATCAP_20) +DEF_ICON_COLOR(MATCAP_21) +DEF_ICON_COLOR(MATCAP_22) +DEF_ICON_COLOR(MATCAP_23) +DEF_ICON_COLOR(MATCAP_24) /* grease pencil sculpt */ -DEF_ICON(GPBRUSH_SMOOTH) -DEF_ICON(GPBRUSH_THICKNESS) -DEF_ICON(GPBRUSH_STRENGTH) -DEF_ICON(GPBRUSH_GRAB) -DEF_ICON(GPBRUSH_PUSH) -DEF_ICON(GPBRUSH_TWIST) -DEF_ICON(GPBRUSH_PINCH) -DEF_ICON(GPBRUSH_RANDOMIZE) -DEF_ICON(GPBRUSH_CLONE) -DEF_ICON(GPBRUSH_WEIGHT) +DEF_ICON_COLOR(GPBRUSH_SMOOTH) +DEF_ICON_COLOR(GPBRUSH_THICKNESS) +DEF_ICON_COLOR(GPBRUSH_STRENGTH) +DEF_ICON_COLOR(GPBRUSH_GRAB) +DEF_ICON_COLOR(GPBRUSH_PUSH) +DEF_ICON_COLOR(GPBRUSH_TWIST) +DEF_ICON_COLOR(GPBRUSH_PINCH) +DEF_ICON_COLOR(GPBRUSH_RANDOMIZE) +DEF_ICON_COLOR(GPBRUSH_CLONE) +DEF_ICON_COLOR(GPBRUSH_WEIGHT) -DEF_ICON(GPBRUSH_PENCIL) -DEF_ICON(GPBRUSH_PEN) -DEF_ICON(GPBRUSH_INK) -DEF_ICON(GPBRUSH_INKNOISE) -DEF_ICON(GPBRUSH_BLOCK) -DEF_ICON(GPBRUSH_MARKER) -DEF_ICON(GPBRUSH_CUSTOM) -DEF_ICON(GPBRUSH_FILL) -DEF_ICON(GPBRUSH_ERASE_SOFT) -DEF_ICON(GPBRUSH_ERASE_HARD) -DEF_ICON(GPBRUSH_ERASE_STROKE) +DEF_ICON_COLOR(GPBRUSH_PENCIL) +DEF_ICON_COLOR(GPBRUSH_PEN) +DEF_ICON_COLOR(GPBRUSH_INK) +DEF_ICON_COLOR(GPBRUSH_INKNOISE) +DEF_ICON_COLOR(GPBRUSH_BLOCK) +DEF_ICON_COLOR(GPBRUSH_MARKER) +DEF_ICON_COLOR(GPBRUSH_CUSTOM) +DEF_ICON_COLOR(GPBRUSH_FILL) +DEF_ICON_COLOR(GPBRUSH_ERASE_SOFT) +DEF_ICON_COLOR(GPBRUSH_ERASE_HARD) +DEF_ICON_COLOR(GPBRUSH_ERASE_STROKE) /* Vector Icons */ DEF_ICON_VECTOR(SMALL_TRI_RIGHT_VEC) @@ -987,53 +984,53 @@ DEF_ICON_VECTOR(COLORSET_19_VEC) DEF_ICON_VECTOR(COLORSET_20_VEC) /* Events */ -DEF_ICON(EVENT_A) -DEF_ICON(EVENT_B) -DEF_ICON(EVENT_C) -DEF_ICON(EVENT_D) -DEF_ICON(EVENT_E) -DEF_ICON(EVENT_F) -DEF_ICON(EVENT_G) -DEF_ICON(EVENT_H) -DEF_ICON(EVENT_I) -DEF_ICON(EVENT_J) -DEF_ICON(EVENT_K) -DEF_ICON(EVENT_L) -DEF_ICON(EVENT_M) -DEF_ICON(EVENT_N) -DEF_ICON(EVENT_O) -DEF_ICON(EVENT_P) -DEF_ICON(EVENT_Q) -DEF_ICON(EVENT_R) -DEF_ICON(EVENT_S) -DEF_ICON(EVENT_T) -DEF_ICON(EVENT_U) -DEF_ICON(EVENT_V) -DEF_ICON(EVENT_W) -DEF_ICON(EVENT_X) -DEF_ICON(EVENT_Y) -DEF_ICON(EVENT_Z) -DEF_ICON(EVENT_SHIFT) -DEF_ICON(EVENT_CTRL) -DEF_ICON(EVENT_ALT) -DEF_ICON(EVENT_OS) -DEF_ICON(EVENT_F1) -DEF_ICON(EVENT_F2) -DEF_ICON(EVENT_F3) -DEF_ICON(EVENT_F4) -DEF_ICON(EVENT_F5) -DEF_ICON(EVENT_F6) -DEF_ICON(EVENT_F7) -DEF_ICON(EVENT_F8) -DEF_ICON(EVENT_F9) -DEF_ICON(EVENT_F10) -DEF_ICON(EVENT_F11) -DEF_ICON(EVENT_F12) -DEF_ICON(EVENT_ESC) -DEF_ICON(EVENT_TAB) -DEF_ICON(EVENT_PAGEUP) -DEF_ICON(EVENT_PAGEDOWN) -DEF_ICON(EVENT_HOME) -DEF_ICON(EVENT_END) -DEF_ICON(EVENT_RETURN) +DEF_ICON_COLOR(EVENT_A) +DEF_ICON_COLOR(EVENT_B) +DEF_ICON_COLOR(EVENT_C) +DEF_ICON_COLOR(EVENT_D) +DEF_ICON_COLOR(EVENT_E) +DEF_ICON_COLOR(EVENT_F) +DEF_ICON_COLOR(EVENT_G) +DEF_ICON_COLOR(EVENT_H) +DEF_ICON_COLOR(EVENT_I) +DEF_ICON_COLOR(EVENT_J) +DEF_ICON_COLOR(EVENT_K) +DEF_ICON_COLOR(EVENT_L) +DEF_ICON_COLOR(EVENT_M) +DEF_ICON_COLOR(EVENT_N) +DEF_ICON_COLOR(EVENT_O) +DEF_ICON_COLOR(EVENT_P) +DEF_ICON_COLOR(EVENT_Q) +DEF_ICON_COLOR(EVENT_R) +DEF_ICON_COLOR(EVENT_S) +DEF_ICON_COLOR(EVENT_T) +DEF_ICON_COLOR(EVENT_U) +DEF_ICON_COLOR(EVENT_V) +DEF_ICON_COLOR(EVENT_W) +DEF_ICON_COLOR(EVENT_X) +DEF_ICON_COLOR(EVENT_Y) +DEF_ICON_COLOR(EVENT_Z) +DEF_ICON_COLOR(EVENT_SHIFT) +DEF_ICON_COLOR(EVENT_CTRL) +DEF_ICON_COLOR(EVENT_ALT) +DEF_ICON_COLOR(EVENT_OS) +DEF_ICON_COLOR(EVENT_F1) +DEF_ICON_COLOR(EVENT_F2) +DEF_ICON_COLOR(EVENT_F3) +DEF_ICON_COLOR(EVENT_F4) +DEF_ICON_COLOR(EVENT_F5) +DEF_ICON_COLOR(EVENT_F6) +DEF_ICON_COLOR(EVENT_F7) +DEF_ICON_COLOR(EVENT_F8) +DEF_ICON_COLOR(EVENT_F9) +DEF_ICON_COLOR(EVENT_F10) +DEF_ICON_COLOR(EVENT_F11) +DEF_ICON_COLOR(EVENT_F12) +DEF_ICON_COLOR(EVENT_ESC) +DEF_ICON_COLOR(EVENT_TAB) +DEF_ICON_COLOR(EVENT_PAGEUP) +DEF_ICON_COLOR(EVENT_PAGEDOWN) +DEF_ICON_COLOR(EVENT_HOME) +DEF_ICON_COLOR(EVENT_END) +DEF_ICON_COLOR(EVENT_RETURN) /* add as needed. */ diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 458b43231d9..6315a3daafa 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -36,7 +36,7 @@ /* and add/replace include of UI_resources.h by UI_interface_icons.h */ #define DEF_ICON(name) ICON_##name, #define DEF_ICON_VECTOR(name) ICON_##name, -#define DEF_ICON_MONO(name) ICON_##name, +#define DEF_ICON_COLOR(name) ICON_##name, #define DEF_ICON_BLANK(name) ICON_BLANK_##name, typedef enum { @@ -49,7 +49,7 @@ typedef enum { #undef DEF_ICON #undef DEF_ICON_VECTOR -#undef DEF_ICON_MONO +#undef DEF_ICON_COLOR #undef DEF_ICON_BLANK /* use to denote intentionally unset theme color */ diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 64f3a8a31d8..1737cd74c8a 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -104,7 +104,7 @@ typedef struct IconImage { typedef void (*VectorDrawFunc)(int x, int y, int w, int h, float alpha); #define ICON_TYPE_PREVIEW 0 -#define ICON_TYPE_TEXTURE 1 +#define ICON_TYPE_COLOR_TEXTURE 1 #define ICON_TYPE_MONO_TEXTURE 2 #define ICON_TYPE_BUFFER 3 #define ICON_TYPE_VECTOR 4 @@ -156,14 +156,14 @@ static struct ListBase iconfilelist = {NULL, NULL}; static IconTexture icongltex = {0, 0, 0, 0.0f, 0.0f}; static const int icontypes[] = { -#define DEF_ICON(name) ICON_TYPE_TEXTURE, +#define DEF_ICON(name) ICON_TYPE_MONO_TEXTURE, #define DEF_ICON_VECTOR(name) ICON_TYPE_VECTOR, -#define DEF_ICON_MONO(name) ICON_TYPE_MONO_TEXTURE, +#define DEF_ICON_COLOR(name) ICON_TYPE_COLOR_TEXTURE, #define DEF_ICON_BLANK(name) ICON_TYPE_BLANK, #include "UI_icons.h" #undef DEF_ICON #undef DEF_ICON_VECTOR -#undef DEF_ICON_MONO +#undef DEF_ICON_COLOR #undef DEF_ICON_BLANK }; @@ -185,7 +185,7 @@ static DrawInfo *def_internal_icon(ImBuf *bbuf, int icon_id, int xofs, int yofs, di = MEM_callocN(sizeof(DrawInfo), "drawinfo"); di->type = type; - if (ELEM(type, ICON_TYPE_TEXTURE, ICON_TYPE_MONO_TEXTURE)) { + if (ELEM(type, ICON_TYPE_COLOR_TEXTURE, ICON_TYPE_MONO_TEXTURE)) { di->data.texture.x = xofs; di->data.texture.y = yofs; di->data.texture.w = size; @@ -742,7 +742,7 @@ static void init_internal_icons(void) /* Row W has monochrome icons. */ for (x = 0; x < ICON_GRID_COLS; x++) { int icontype = icontypes[y * ICON_GRID_COLS + x]; - if (!ELEM(icontype, ICON_TYPE_TEXTURE, ICON_TYPE_MONO_TEXTURE)) { + if (!ELEM(icontype, ICON_TYPE_COLOR_TEXTURE, ICON_TYPE_MONO_TEXTURE)) { continue; } @@ -1520,7 +1520,7 @@ static void icon_draw_size( const short event_value = di->data.input.event_value; icon_draw_rect_input(x, y, w, h, alpha, event_type, event_value); } - else if (di->type == ICON_TYPE_TEXTURE) { + else if (di->type == ICON_TYPE_COLOR_TEXTURE) { /* texture image use premul alpha for correct scaling */ icon_draw_texture(x, y, (float)w, (float)h, di->data.texture.x, di->data.texture.y, di->data.texture.w, di->data.texture.h, alpha, rgb); diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 8612a14c308..cfc47e65a26 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -788,7 +788,7 @@ static uiBut *ui_item_with_label( /* BUTTONS_OT_file_browse calls UI_context_active_but_prop_get_filebrowser */ uiDefIconButO( block, UI_BTYPE_BUT, subtype == PROP_DIRPATH ? "BUTTONS_OT_directory_browse" : "BUTTONS_OT_file_browse", - WM_OP_INVOKE_DEFAULT, ICON_FILESEL, x, y, UI_UNIT_X, h, NULL); + WM_OP_INVOKE_DEFAULT, ICON_FILEBROWSER, x, y, UI_UNIT_X, h, NULL); } else if (flag & UI_ITEM_R_EVENT) { but = uiDefButR_prop(block, UI_BTYPE_KEY_EVENT, 0, name, x, y, prop_but_width, h, ptr, prop, index, 0, 0, -1, -1, NULL); diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 78322e1e1bc..67ab9aa7f44 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -623,13 +623,13 @@ static uiBut *template_id_def_new_but( if (newop) { but = uiDefIconTextButO( - block, but_type, newop, WM_OP_INVOKE_DEFAULT, ICON_ZOOMIN, + block, but_type, newop, WM_OP_INVOKE_DEFAULT, ICON_ADD, (id) ? "" : CTX_IFACE_(template_id_context(type), "New"), 0, 0, w, but_height, NULL); UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), POINTER_FROM_INT(UI_ID_ADD_NEW)); } else { but = uiDefIconTextBut( - block, but_type, 0, ICON_ZOOMIN, (id) ? "" : CTX_IFACE_(template_id_context(type), "New"), + block, but_type, 0, ICON_ADD, (id) ? "" : CTX_IFACE_(template_id_context(type), "New"), 0, 0, w, but_height, NULL, 0, 0, 0, 0, NULL); UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), POINTER_FROM_INT(UI_ID_ADD_NEW)); } @@ -773,13 +773,13 @@ static void template_ID( if (openop) { but = uiDefIconTextButO( - block, UI_BTYPE_BUT, openop, WM_OP_INVOKE_DEFAULT, ICON_FILESEL, (id) ? "" : IFACE_("Open"), + block, UI_BTYPE_BUT, openop, WM_OP_INVOKE_DEFAULT, ICON_FILEBROWSER, (id) ? "" : IFACE_("Open"), 0, 0, w, UI_UNIT_Y, NULL); UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), POINTER_FROM_INT(UI_ID_OPEN)); } else { but = uiDefIconTextBut( - block, UI_BTYPE_BUT, 0, ICON_FILESEL, (id) ? "" : IFACE_("Open"), 0, 0, w, UI_UNIT_Y, + block, UI_BTYPE_BUT, 0, ICON_FILEBROWSER, (id) ? "" : IFACE_("Open"), 0, 0, w, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL); UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), POINTER_FROM_INT(UI_ID_OPEN)); } @@ -1164,7 +1164,7 @@ static void template_search_buttons( template_search_add_button_searchmenu(C, layout, block, template_search, editable, false); template_search_add_button_name(block, &active_ptr, type); - template_search_add_button_operator(block, newop, WM_OP_INVOKE_DEFAULT, ICON_ZOOMIN, editable); + template_search_add_button_operator(block, newop, WM_OP_INVOKE_DEFAULT, ICON_ADD, editable); template_search_add_button_operator(block, unlinkop, WM_OP_INVOKE_REGION_WIN, ICON_X, editable); UI_block_align_end(block); @@ -1474,10 +1474,10 @@ static uiLayout *draw_modifier( uiItemO(row, "", ICON_X, "OBJECT_OT_modifier_remove"); } else if (modifier_is_simulation(md) == 1) { - uiItemStringO(row, "", ICON_BUTS, "WM_OT_properties_context_change", "context", "PHYSICS"); + uiItemStringO(row, "", ICON_PROPERTIES, "WM_OT_properties_context_change", "context", "PHYSICS"); } else if (modifier_is_simulation(md) == 2) { - uiItemStringO(row, "", ICON_BUTS, "WM_OT_properties_context_change", "context", "PARTICLES"); + uiItemStringO(row, "", ICON_PROPERTIES, "WM_OT_properties_context_change", "context", "PARTICLES"); } UI_block_emboss_set(block, UI_EMBOSS); } @@ -2039,7 +2039,7 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con) /* enabled */ UI_block_emboss_set(block, UI_EMBOSS_NONE); uiItemR(row, &ptr, "mute", 0, "", - (con->flag & CONSTRAINT_OFF) ? ICON_HIDE_ON : ICON_HIDE_OFF); + (con->flag & CONSTRAINT_OFF) ? ICON_RESTRICT_VIEW_ON : ICON_RESTRICT_VIEW_OFF); UI_block_emboss_set(block, UI_EMBOSS); uiLayoutSetOperatorContext(row, WM_OP_INVOKE_DEFAULT); @@ -2361,13 +2361,13 @@ static void colorband_buttons_layout( row = uiLayoutRow(split, false); bt = uiDefIconTextBut( - block, UI_BTYPE_BUT, 0, ICON_ZOOMIN, "", 0, 0, 2.0f * unit, UI_UNIT_Y, NULL, + block, UI_BTYPE_BUT, 0, ICON_ADD, "", 0, 0, 2.0f * unit, UI_UNIT_Y, NULL, 0, 0, 0, 0, TIP_("Add a new color stop to the colorband")); UI_but_funcN_set(bt, colorband_add_cb, MEM_dupallocN(cb), coba); bt = uiDefIconTextBut( - block, UI_BTYPE_BUT, 0, ICON_ZOOMOUT, "", xs + 2.0f * unit, ys + UI_UNIT_Y, 2.0f * unit, UI_UNIT_Y, + block, UI_BTYPE_BUT, 0, ICON_REMOVE, "", xs + 2.0f * unit, ys + UI_UNIT_Y, 2.0f * unit, UI_UNIT_Y, NULL, 0, 0, 0, 0, TIP_("Delete the active position")); UI_but_funcN_set(bt, colorband_del_cb, MEM_dupallocN(cb), coba); @@ -3309,8 +3309,8 @@ void uiTemplatePalette(uiLayout *layout, PointerRNA *ptr, const char *propname, col = uiLayoutColumn(layout, true); uiLayoutRow(col, true); - uiDefIconButO(block, UI_BTYPE_BUT, "PALETTE_OT_color_add", WM_OP_INVOKE_DEFAULT, ICON_ZOOMIN, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL); - uiDefIconButO(block, UI_BTYPE_BUT, "PALETTE_OT_color_delete", WM_OP_INVOKE_DEFAULT, ICON_ZOOMOUT, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL); + uiDefIconButO(block, UI_BTYPE_BUT, "PALETTE_OT_color_add", WM_OP_INVOKE_DEFAULT, ICON_ADD, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL); + uiDefIconButO(block, UI_BTYPE_BUT, "PALETTE_OT_color_delete", WM_OP_INVOKE_DEFAULT, ICON_REMOVE, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL); col = uiLayoutColumn(layout, true); uiLayoutRow(col, true); @@ -3491,7 +3491,7 @@ static void uilist_draw_filter_default(struct uiList *ui_list, struct bContext * subrow = uiLayoutRow(row, true); uiItemR(subrow, &listptr, "use_filter_sort_alpha", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_NONE); uiItemR(subrow, &listptr, "use_filter_sort_reverse", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", - (ui_list->filter_sort_flag & UILST_FLT_SORT_REVERSE) ? ICON_TRIA_UP : ICON_TRIA_DOWN); + (ui_list->filter_sort_flag & UILST_FLT_SORT_REVERSE) ? ICON_SORT_DESC : ICON_SORT_ASC); } typedef struct { @@ -4299,10 +4299,10 @@ eAutoPropButsReturn uiTemplateOperatorPropertyButs( uiItemM(row, "WM_MT_operator_presets", NULL, ICON_NONE); wmOperatorType *ot = WM_operatortype_find("WM_OT_operator_preset_add", false); - uiItemFullO_ptr(row, ot, "", ICON_ZOOMIN, NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr); + uiItemFullO_ptr(row, ot, "", ICON_ADD, NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr); RNA_string_set(&op_ptr, "operator", op->type->idname); - uiItemFullO_ptr(row, ot, "", ICON_ZOOMOUT, NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr); + uiItemFullO_ptr(row, ot, "", ICON_REMOVE, NULL, WM_OP_INVOKE_DEFAULT, 0, &op_ptr); RNA_string_set(&op_ptr, "operator", op->type->idname); RNA_boolean_set(&op_ptr, "remove_active", true); } @@ -4481,7 +4481,7 @@ void uiTemplateRunningJobs(uiLayout *layout, bContext *C) owner = sa; } handle_event = B_STOPFILE; - icon = ICON_FILESEL; + icon = ICON_FILEBROWSER; } else { Scene *scene; @@ -4506,7 +4506,7 @@ void uiTemplateRunningJobs(uiLayout *layout, bContext *C) */ if (sa->spacetype != SPACE_NODE) { handle_event = B_STOPOTHER; - icon = ICON_IMAGE_COL; + icon = ICON_IMAGE; break; } } diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index c893f106363..89eea4c1b64 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1993,7 +1993,7 @@ static void move_to_collection_menu_create(bContext *UNUSED(C), uiLayout *layout uiItemFullO_ptr(layout, menu->ot, "New Collection", - ICON_ZOOMIN, + ICON_ADD, menu->ptr.data, WM_OP_INVOKE_DEFAULT, 0, diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index de422565abd..958b55526c3 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -507,7 +507,7 @@ void uiTemplateTextureShow(uiLayout *layout, bContext *C, PointerRNA *ptr, Prope uiBlock *block = uiLayoutGetBlock(layout); uiBut *but; - but = uiDefIconBut(block, UI_BTYPE_BUT, 0, ICON_BUTS, 0, 0, UI_UNIT_X, UI_UNIT_Y, + but = uiDefIconBut(block, UI_BTYPE_BUT, 0, ICON_PROPERTIES, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0.0, 0.0, TIP_("Show texture in texture tab")); UI_but_func_set(but, template_texture_show, user->ptr.data, user->prop); } diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index 679ae6b9648..79b73f6ff52 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -221,13 +221,13 @@ void file_draw_buttons(const bContext *C, ARegion *ar) /* Filename number increment / decrement buttons. */ if (fnumbuttons && (params->flag & FILE_DIRSEL_ONLY) == 0) { UI_block_align_begin(block); - but = uiDefIconButO(block, UI_BTYPE_BUT, "FILE_OT_filenum", 0, ICON_ZOOMOUT, + but = uiDefIconButO(block, UI_BTYPE_BUT, "FILE_OT_filenum", 0, ICON_REMOVE, min_x + line2_w + separator - chan_offs, line2_y, btn_fn_w, btn_h, TIP_("Decrement the filename number")); RNA_int_set(UI_but_operator_ptr_get(but), "increment", -1); - but = uiDefIconButO(block, UI_BTYPE_BUT, "FILE_OT_filenum", 0, ICON_ZOOMIN, + but = uiDefIconButO(block, UI_BTYPE_BUT, "FILE_OT_filenum", 0, ICON_ADD, min_x + line2_w + separator + btn_fn_w - chan_offs, line2_y, btn_fn_w, btn_h, TIP_("Increment the filename number")); diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index c8b3b182b9c..ddb248f754d 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -874,7 +874,7 @@ static void graph_draw_driver_settings_panel(uiLayout *layout, ID *id, FCurve *f /* add driver variable - add blank */ row = uiLayoutRow(layout, true); block = uiLayoutGetBlock(row); - but = uiDefIconTextBut(block, UI_BTYPE_BUT, B_IPO_DEPCHANGE, ICON_ZOOMIN, IFACE_("Add Input Variable"), + but = uiDefIconTextBut(block, UI_BTYPE_BUT, B_IPO_DEPCHANGE, ICON_ADD, IFACE_("Add Input Variable"), 0, 0, 10 * UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, TIP_("Add a Driver Variable to keep track an input used by the driver")); @@ -888,7 +888,7 @@ static void graph_draw_driver_settings_panel(uiLayout *layout, ID *id, FCurve *f /* add driver variable */ row = uiLayoutRow(layout, false); block = uiLayoutGetBlock(row); - but = uiDefIconTextBut(block, UI_BTYPE_BUT, B_IPO_DEPCHANGE, ICON_ZOOMIN, IFACE_("Add Input Variable"), + but = uiDefIconTextBut(block, UI_BTYPE_BUT, B_IPO_DEPCHANGE, ICON_ADD, IFACE_("Add Input Variable"), 0, 0, 10 * UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, TIP_("Driver variables ensure that all dependencies will be accounted for, eusuring that drivers will update correctly")); diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index b9f49d0aeae..fa2fc44645a 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -1786,7 +1786,7 @@ static void node_composit_buts_file_output_ex(uiLayout *layout, bContext *C, Poi uiItemS(layout); - uiItemO(layout, IFACE_("Add Input"), ICON_ZOOMIN, "NODE_OT_output_file_add_socket"); + uiItemO(layout, IFACE_("Add Input"), ICON_ADD, "NODE_OT_output_file_add_socket"); row = uiLayoutRow(layout, false); col = uiLayoutColumn(row, true); @@ -2495,8 +2495,8 @@ static void node_composit_buts_cryptomatte(uiLayout *layout, bContext *UNUSED(C) static void node_composit_buts_cryptomatte_ex(uiLayout *layout, bContext *UNUSED(C), PointerRNA *UNUSED(ptr)) { - uiItemO(layout, IFACE_("Add Crypto Layer"), ICON_ZOOMIN, "NODE_OT_cryptomatte_layer_add"); - uiItemO(layout, IFACE_("Remove Crypto Layer"), ICON_ZOOMOUT, "NODE_OT_cryptomatte_layer_remove"); + uiItemO(layout, IFACE_("Add Crypto Layer"), ICON_ADD, "NODE_OT_cryptomatte_layer_add"); + uiItemO(layout, IFACE_("Remove Crypto Layer"), ICON_REMOVE, "NODE_OT_cryptomatte_layer_remove"); } static void node_composit_buts_brightcontrast(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) @@ -3007,9 +3007,9 @@ void ED_node_init_butfuncs(void) NODE_TYPES_END /* tree type icons */ - ntreeType_Composite->ui_icon = ICON_RENDERLAYERS; - ntreeType_Shader->ui_icon = ICON_MATERIAL; - ntreeType_Texture->ui_icon = ICON_TEXTURE; + ntreeType_Composite->ui_icon = ICON_NODE_COMPOSITING; + ntreeType_Shader->ui_icon = ICON_NODE_MATERIAL; + ntreeType_Texture->ui_icon = ICON_NODE_TEXTURE; } void ED_init_custom_node_type(bNodeType *ntype) diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index f95081da4a5..3bf85dd7e57 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1143,7 +1143,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) else if (te->idcode == SEQ_TYPE_SOUND_RAM) data.icon = ICON_SOUND; else if (te->idcode == SEQ_TYPE_IMAGE) - data.icon = ICON_IMAGE_COL; + data.icon = ICON_IMAGE; else data.icon = ICON_PARTICLES; break; @@ -1226,6 +1226,9 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) if (ob->dup_group) { data.icon = ICON_OUTLINER_OB_GROUP_INSTANCE; } + else if (ob->empty_drawtype == OB_EMPTY_IMAGE) { + data.icon = ICON_OUTLINER_OB_IMAGE; + } else { data.icon = ICON_OUTLINER_OB_EMPTY; } @@ -1328,7 +1331,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) data.icon = ICON_BRUSH_DATA; break; case ID_SCR: case ID_WS: - data.icon = ICON_SPLITSCREEN; break; + data.icon = ICON_WORKSPACE; break; default: break; } diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index cc1c1bffff2..676fd49f232 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -83,7 +83,7 @@ const EnumPropertyItem rna_enum_id_type_items[] = { {ID_TE, "TEXTURE", ICON_TEXTURE_DATA, "Texture", ""}, {ID_WM, "WINDOWMANAGER", ICON_FULLSCREEN, "Window Manager", ""}, {ID_WO, "WORLD", ICON_WORLD_DATA, "World", ""}, - {ID_WS, "WORKSPACE", ICON_SPLITSCREEN, "Workspace", ""}, + {ID_WS, "WORKSPACE", ICON_WORKSPACE, "Workspace", ""}, {0, NULL, 0, NULL, NULL} }; diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index 12e28d457fb..fe4c92b9163 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -322,7 +322,7 @@ static void rna_def_dopesheet(BlenderRNA *brna) prop = RNA_def_property(srna, "show_only_errors", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_ONLY_ERRORS); RNA_def_property_ui_text(prop, "Show Errors", "Only include F-Curves and drivers that are disabled or have errors"); - RNA_def_property_ui_icon(prop, ICON_HELP, 0); /* XXX: this doesn't quite fit */ + RNA_def_property_ui_icon(prop, ICON_ERROR, 0); RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL); /* Object Collection Filtering Settings */ diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 5d66742e8a3..629343bb62b 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -46,8 +46,8 @@ #include "WM_types.h" static const EnumPropertyItem prop_direction_items[] = { - {0, "ADD", ICON_ZOOMIN, "Add", "Add effect of brush"}, - {BRUSH_DIR_IN, "SUBTRACT", ICON_ZOOMOUT, "Subtract", "Subtract effect of brush"}, + {0, "ADD", ICON_ADD, "Add", "Add effect of brush"}, + {BRUSH_DIR_IN, "SUBTRACT", ICON_REMOVE, "Subtract", "Subtract effect of brush"}, {0, NULL, 0, NULL, NULL} }; @@ -589,39 +589,39 @@ static const EnumPropertyItem *rna_Brush_direction_itemf(bContext *C, PointerRNA /* sculpt mode */ static const EnumPropertyItem prop_flatten_contrast_items[] = { - {BRUSH_DIR_IN, "CONTRAST", ICON_ZOOMIN, "Contrast", "Subtract effect of brush"}, - {0, "FLATTEN", ICON_ZOOMOUT, "Flatten", "Add effect of brush"}, + {BRUSH_DIR_IN, "CONTRAST", ICON_ADD, "Contrast", "Subtract effect of brush"}, + {0, "FLATTEN", ICON_REMOVE, "Flatten", "Add effect of brush"}, {0, NULL, 0, NULL, NULL} }; static const EnumPropertyItem prop_fill_deepen_items[] = { - {0, "FILL", ICON_ZOOMIN, "Fill", "Add effect of brush"}, - {BRUSH_DIR_IN, "DEEPEN", ICON_ZOOMOUT, "Deepen", "Subtract effect of brush"}, + {0, "FILL", ICON_ADD, "Fill", "Add effect of brush"}, + {BRUSH_DIR_IN, "DEEPEN", ICON_REMOVE, "Deepen", "Subtract effect of brush"}, {0, NULL, 0, NULL, NULL} }; static const EnumPropertyItem prop_scrape_peaks_items[] = { - {0, "SCRAPE", ICON_ZOOMIN, "Scrape", "Add effect of brush"}, - {BRUSH_DIR_IN, "PEAKS", ICON_ZOOMOUT, "Peaks", "Subtract effect of brush"}, + {0, "SCRAPE", ICON_ADD, "Scrape", "Add effect of brush"}, + {BRUSH_DIR_IN, "PEAKS", ICON_REMOVE, "Peaks", "Subtract effect of brush"}, {0, NULL, 0, NULL, NULL} }; static const EnumPropertyItem prop_pinch_magnify_items[] = { - {BRUSH_DIR_IN, "MAGNIFY", ICON_ZOOMIN, "Magnify", "Subtract effect of brush"}, - {0, "PINCH", ICON_ZOOMOUT, "Pinch", "Add effect of brush"}, + {BRUSH_DIR_IN, "MAGNIFY", ICON_ADD, "Magnify", "Subtract effect of brush"}, + {0, "PINCH", ICON_REMOVE, "Pinch", "Add effect of brush"}, {0, NULL, 0, NULL, NULL} }; static const EnumPropertyItem prop_inflate_deflate_items[] = { - {0, "INFLATE", ICON_ZOOMIN, "Inflate", "Add effect of brush"}, - {BRUSH_DIR_IN, "DEFLATE", ICON_ZOOMOUT, "Deflate", "Subtract effect of brush"}, + {0, "INFLATE", ICON_ADD, "Inflate", "Add effect of brush"}, + {BRUSH_DIR_IN, "DEFLATE", ICON_REMOVE, "Deflate", "Subtract effect of brush"}, {0, NULL, 0, NULL, NULL} }; /* texture paint mode */ static const EnumPropertyItem prop_soften_sharpen_items[] = { - {BRUSH_DIR_IN, "SHARPEN", ICON_ZOOMIN, "Sharpen", "Sharpen effect of brush"}, - {0, "SOFTEN", ICON_ZOOMOUT, "Soften", "Blur effect of brush"}, + {BRUSH_DIR_IN, "SHARPEN", ICON_ADD, "Sharpen", "Sharpen effect of brush"}, + {0, "SOFTEN", ICON_REMOVE, "Soften", "Blur effect of brush"}, {0, NULL, 0, NULL, NULL} }; diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index 4cbe365167c..3cf959eaee1 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -1005,7 +1005,7 @@ static void rna_def_histogram(BlenderRNA *brna) prop = RNA_def_property(srna, "show_line", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", HISTO_FLAG_LINE); RNA_def_property_ui_text(prop, "Show Line", "Display lines rather than filled shapes"); - RNA_def_property_ui_icon(prop, ICON_IPO, 0); + RNA_def_property_ui_icon(prop, ICON_GRAPH, 0); } static void rna_def_scopes(BlenderRNA *brna) diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index ba87d08fdac..1e7ed90a4a5 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -48,63 +48,63 @@ /* please keep the names in sync with constraint.c */ const EnumPropertyItem rna_enum_constraint_type_items[] = { {0, "", 0, N_("Motion Tracking"), ""}, - {CONSTRAINT_TYPE_CAMERASOLVER, "CAMERA_SOLVER", ICON_CONSTRAINT_DATA, "Camera Solver", ""}, - {CONSTRAINT_TYPE_FOLLOWTRACK, "FOLLOW_TRACK", ICON_CONSTRAINT_DATA, "Follow Track", ""}, - {CONSTRAINT_TYPE_OBJECTSOLVER, "OBJECT_SOLVER", ICON_CONSTRAINT_DATA, "Object Solver", ""}, + {CONSTRAINT_TYPE_CAMERASOLVER, "CAMERA_SOLVER", ICON_CONSTRAINT, "Camera Solver", ""}, + {CONSTRAINT_TYPE_FOLLOWTRACK, "FOLLOW_TRACK", ICON_CONSTRAINT, "Follow Track", ""}, + {CONSTRAINT_TYPE_OBJECTSOLVER, "OBJECT_SOLVER", ICON_CONSTRAINT, "Object Solver", ""}, {0, "", 0, N_("Transform"), ""}, - {CONSTRAINT_TYPE_LOCLIKE, "COPY_LOCATION", ICON_CONSTRAINT_DATA, "Copy Location", + {CONSTRAINT_TYPE_LOCLIKE, "COPY_LOCATION", ICON_CONSTRAINT, "Copy Location", "Copy the location of a target (with an optional offset), so that they move together"}, - {CONSTRAINT_TYPE_ROTLIKE, "COPY_ROTATION", ICON_CONSTRAINT_DATA, "Copy Rotation", + {CONSTRAINT_TYPE_ROTLIKE, "COPY_ROTATION", ICON_CONSTRAINT, "Copy Rotation", "Copy the rotation of a target (with an optional offset), so that they rotate together"}, - {CONSTRAINT_TYPE_SIZELIKE, "COPY_SCALE", ICON_CONSTRAINT_DATA, "Copy Scale", + {CONSTRAINT_TYPE_SIZELIKE, "COPY_SCALE", ICON_CONSTRAINT, "Copy Scale", "Copy the scale factors of a target (with an optional offset), so that they are scaled by the same amount"}, - {CONSTRAINT_TYPE_TRANSLIKE, "COPY_TRANSFORMS", ICON_CONSTRAINT_DATA, "Copy Transforms", + {CONSTRAINT_TYPE_TRANSLIKE, "COPY_TRANSFORMS", ICON_CONSTRAINT, "Copy Transforms", "Copy all the transformations of a target, so that they move together"}, - {CONSTRAINT_TYPE_DISTLIMIT, "LIMIT_DISTANCE", ICON_CONSTRAINT_DATA, "Limit Distance", + {CONSTRAINT_TYPE_DISTLIMIT, "LIMIT_DISTANCE", ICON_CONSTRAINT, "Limit Distance", "Restrict movements to within a certain distance of a target (at the time of constraint evaluation only)"}, - {CONSTRAINT_TYPE_LOCLIMIT, "LIMIT_LOCATION", ICON_CONSTRAINT_DATA, "Limit Location", + {CONSTRAINT_TYPE_LOCLIMIT, "LIMIT_LOCATION", ICON_CONSTRAINT, "Limit Location", "Restrict movement along each axis within given ranges"}, - {CONSTRAINT_TYPE_ROTLIMIT, "LIMIT_ROTATION", ICON_CONSTRAINT_DATA, "Limit Rotation", + {CONSTRAINT_TYPE_ROTLIMIT, "LIMIT_ROTATION", ICON_CONSTRAINT, "Limit Rotation", "Restrict rotation along each axis within given ranges"}, - {CONSTRAINT_TYPE_SIZELIMIT, "LIMIT_SCALE", ICON_CONSTRAINT_DATA, "Limit Scale", + {CONSTRAINT_TYPE_SIZELIMIT, "LIMIT_SCALE", ICON_CONSTRAINT, "Limit Scale", "Restrict scaling along each axis with given ranges"}, - {CONSTRAINT_TYPE_SAMEVOL, "MAINTAIN_VOLUME", ICON_CONSTRAINT_DATA, "Maintain Volume", + {CONSTRAINT_TYPE_SAMEVOL, "MAINTAIN_VOLUME", ICON_CONSTRAINT, "Maintain Volume", "Compensate for scaling one axis by applying suitable scaling to the other two axes"}, - {CONSTRAINT_TYPE_TRANSFORM, "TRANSFORM", ICON_CONSTRAINT_DATA, "Transformation", + {CONSTRAINT_TYPE_TRANSFORM, "TRANSFORM", ICON_CONSTRAINT, "Transformation", "Use one transform property from target to control another (or same) property on owner"}, - {CONSTRAINT_TYPE_TRANSFORM_CACHE, "TRANSFORM_CACHE", ICON_CONSTRAINT_DATA, "Transform Cache", + {CONSTRAINT_TYPE_TRANSFORM_CACHE, "TRANSFORM_CACHE", ICON_CONSTRAINT, "Transform Cache", "Look up the transformation matrix from an external file"}, {0, "", 0, N_("Tracking"), ""}, - {CONSTRAINT_TYPE_CLAMPTO, "CLAMP_TO", ICON_CONSTRAINT_DATA, "Clamp To", + {CONSTRAINT_TYPE_CLAMPTO, "CLAMP_TO", ICON_CONSTRAINT, "Clamp To", "Restrict movements to lie along a curve by remapping location along curve's longest axis"}, - {CONSTRAINT_TYPE_DAMPTRACK, "DAMPED_TRACK", ICON_CONSTRAINT_DATA, "Damped Track", + {CONSTRAINT_TYPE_DAMPTRACK, "DAMPED_TRACK", ICON_CONSTRAINT, "Damped Track", "Point towards a target by performing the smallest rotation necessary"}, - {CONSTRAINT_TYPE_KINEMATIC, "IK", ICON_CONSTRAINT_DATA, "Inverse Kinematics", + {CONSTRAINT_TYPE_KINEMATIC, "IK", ICON_CONSTRAINT, "Inverse Kinematics", "Control a chain of bones by specifying the endpoint target (Bones only)"}, - {CONSTRAINT_TYPE_LOCKTRACK, "LOCKED_TRACK", ICON_CONSTRAINT_DATA, "Locked Track", + {CONSTRAINT_TYPE_LOCKTRACK, "LOCKED_TRACK", ICON_CONSTRAINT, "Locked Track", "Rotate around the specified ('locked') axis to point towards a target"}, - {CONSTRAINT_TYPE_SPLINEIK, "SPLINE_IK", ICON_CONSTRAINT_DATA, "Spline IK", + {CONSTRAINT_TYPE_SPLINEIK, "SPLINE_IK", ICON_CONSTRAINT, "Spline IK", "Align chain of bones along a curve (Bones only)"}, - {CONSTRAINT_TYPE_STRETCHTO, "STRETCH_TO", ICON_CONSTRAINT_DATA, "Stretch To", + {CONSTRAINT_TYPE_STRETCHTO, "STRETCH_TO", ICON_CONSTRAINT, "Stretch To", "Stretch along Y-Axis to point towards a target"}, - {CONSTRAINT_TYPE_TRACKTO, "TRACK_TO", ICON_CONSTRAINT_DATA, "Track To", + {CONSTRAINT_TYPE_TRACKTO, "TRACK_TO", ICON_CONSTRAINT, "Track To", "Legacy tracking constraint prone to twisting artifacts"}, {0, "", 0, N_("Relationship"), ""}, - {CONSTRAINT_TYPE_ACTION, "ACTION", ICON_CONSTRAINT_DATA, "Action", + {CONSTRAINT_TYPE_ACTION, "ACTION", ICON_CONSTRAINT, "Action", "Use transform property of target to look up pose for owner from an Action"}, - {CONSTRAINT_TYPE_CHILDOF, "CHILD_OF", ICON_CONSTRAINT_DATA, "Child Of", + {CONSTRAINT_TYPE_CHILDOF, "CHILD_OF", ICON_CONSTRAINT, "Child Of", "Make target the 'detachable' parent of owner"}, - {CONSTRAINT_TYPE_MINMAX, "FLOOR", ICON_CONSTRAINT_DATA, "Floor", + {CONSTRAINT_TYPE_MINMAX, "FLOOR", ICON_CONSTRAINT, "Floor", "Use position (and optionally rotation) of target to define a 'wall' or 'floor' that the owner can not cross"}, - {CONSTRAINT_TYPE_FOLLOWPATH, "FOLLOW_PATH", ICON_CONSTRAINT_DATA, "Follow Path", + {CONSTRAINT_TYPE_FOLLOWPATH, "FOLLOW_PATH", ICON_CONSTRAINT, "Follow Path", "Use to animate an object/bone following a path"}, - {CONSTRAINT_TYPE_PIVOT, "PIVOT", ICON_CONSTRAINT_DATA, "Pivot", + {CONSTRAINT_TYPE_PIVOT, "PIVOT", ICON_CONSTRAINT, "Pivot", "Change pivot point for transforms (buggy)"}, /* {CONSTRAINT_TYPE_RIGIDBODYJOINT, "RIGID_BODY_JOINT", ICON_CONSTRAINT_DATA, "Rigid Body Joint", "Use to define a Rigid Body Constraint (for Game Engine use only)"}, */ /* {CONSTRAINT_TYPE_PYTHON, "SCRIPT", ICON_CONSTRAINT_DATA, "Script", "Custom constraint(s) written in Python (Not yet implemented)"}, */ - {CONSTRAINT_TYPE_SHRINKWRAP, "SHRINKWRAP", ICON_CONSTRAINT_DATA, "Shrinkwrap", + {CONSTRAINT_TYPE_SHRINKWRAP, "SHRINKWRAP", ICON_CONSTRAINT, "Shrinkwrap", "Restrict movements to surface of target mesh"}, {0, NULL, 0, NULL, NULL} }; diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index cc1dc5e17b9..b77a77fa0a1 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -956,20 +956,20 @@ static void rna_def_font(BlenderRNA *UNUSED(brna), StructRNA *srna) PropertyRNA *prop; static const EnumPropertyItem prop_align_items[] = { - {CU_ALIGN_X_LEFT, "LEFT", 0, "Left", "Align text to the left"}, - {CU_ALIGN_X_MIDDLE, "CENTER", 0, "Center", "Center text"}, - {CU_ALIGN_X_RIGHT, "RIGHT", 0, "Right", "Align text to the right"}, - {CU_ALIGN_X_JUSTIFY, "JUSTIFY", 0, "Justify", "Align to the left and the right"}, - {CU_ALIGN_X_FLUSH, "FLUSH", 0, "Flush", "Align to the left and the right, with equal character spacing"}, + {CU_ALIGN_X_LEFT, "LEFT", ICON_ALIGN_LEFT, "Left", "Align text to the left"}, + {CU_ALIGN_X_MIDDLE, "CENTER", ICON_ALIGN_CENTER, "Center", "Center text"}, + {CU_ALIGN_X_RIGHT, "RIGHT", ICON_ALIGN_RIGHT, "Right", "Align text to the right"}, + {CU_ALIGN_X_JUSTIFY, "JUSTIFY", ICON_ALIGN_JUSTIFY, "Justify", "Align to the left and the right"}, + {CU_ALIGN_X_FLUSH, "FLUSH", ICON_ALIGN_FLUSH, "Flush", "Align to the left and the right, with equal character spacing"}, {0, NULL, 0, NULL, NULL} }; static const EnumPropertyItem prop_align_y_items[] = { - {CU_ALIGN_Y_TOP_BASELINE, "TOP_BASELINE", 0, "Top Base-Line", "Align to top but use the base-line of the text"}, - {CU_ALIGN_Y_TOP, "TOP", 0, "Top", "Align text to the top"}, - {CU_ALIGN_Y_CENTER, "CENTER", 0, "Center", "Align text to the middle"}, - {CU_ALIGN_Y_BOTTOM, "BOTTOM", 0, "Bottom", "Align text to the bottom"}, - {CU_ALIGN_Y_BOTTOM_BASELINE, "BOTTOM_BASELINE", 0, "Bottom Base-Line", + {CU_ALIGN_Y_TOP_BASELINE, "TOP_BASELINE", ICON_ALIGN_TOP, "Top Base-Line", "Align to top but use the base-line of the text"}, + {CU_ALIGN_Y_TOP, "TOP", ICON_ALIGN_TOP, "Top", "Align text to the top"}, + {CU_ALIGN_Y_CENTER, "CENTER", ICON_ALIGN_MIDDLE, "Center", "Align text to the middle"}, + {CU_ALIGN_Y_BOTTOM, "BOTTOM", ICON_ALIGN_BOTTOM, "Bottom", "Align text to the bottom"}, + {CU_ALIGN_Y_BOTTOM_BASELINE, "BOTTOM_BASELINE", ICON_ALIGN_BOTTOM, "Bottom Base-Line", "Align text to the bottom but use the base-line of the text"}, {0, NULL, 0, NULL, NULL} }; @@ -1179,16 +1179,19 @@ static void rna_def_charinfo(BlenderRNA *brna) prop = RNA_def_property(srna, "use_bold", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_CHINFO_BOLD); RNA_def_property_ui_text(prop, "Bold", ""); + RNA_def_property_ui_icon(prop, ICON_BOLD, 0); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); prop = RNA_def_property(srna, "use_italic", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_CHINFO_ITALIC); RNA_def_property_ui_text(prop, "Italic", ""); + RNA_def_property_ui_icon(prop, ICON_ITALIC, 0); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); prop = RNA_def_property(srna, "use_underline", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_CHINFO_UNDERLINE); RNA_def_property_ui_text(prop, "Underline", ""); + RNA_def_property_ui_icon(prop, ICON_UNDERLINE, 0); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); /* probably there is no reason to expose this */ @@ -1202,6 +1205,7 @@ static void rna_def_charinfo(BlenderRNA *brna) prop = RNA_def_property(srna, "use_small_caps", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_CHINFO_SMALLCAPS); RNA_def_property_ui_text(prop, "Small Caps", ""); + RNA_def_property_ui_icon(prop, ICON_SMALL_CAPS, 0); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); prop = RNA_def_property(srna, "material_index", PROP_INT, PROP_UNSIGNED); diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index 4a2c8055a37..d5717a06eda 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -1097,7 +1097,7 @@ static void rna_def_gpencil_layer(BlenderRNA *brna) /* Flags */ prop = RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_HIDE); - RNA_def_property_ui_icon(prop, ICON_HIDE_OFF, 1); + RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, 1); RNA_def_property_ui_text(prop, "Hide", "Set layer Visibility"); RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index 05efe350a2f..11fb5f7f94b 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -722,7 +722,7 @@ static void rna_def_keyblock(BlenderRNA *brna) prop = RNA_def_property(srna, "mute", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", KEYBLOCK_MUTE); RNA_def_property_ui_text(prop, "Mute", "Mute this shape key"); - RNA_def_property_ui_icon(prop, ICON_HIDE_OFF, 1); + RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, 1); RNA_def_property_update(prop, 0, "rna_Key_update_data"); prop = RNA_def_property(srna, "slider_min", PROP_FLOAT, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index ee0c9e392c4..ac65c25f1da 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -555,7 +555,7 @@ static void rna_def_material_greasepencil(BlenderRNA *brna) /* Flags */ prop = RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_STYLE_COLOR_HIDE); - RNA_def_property_ui_icon(prop, ICON_HIDE_OFF, 1); + RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, 1); RNA_def_property_ui_text(prop, "Hide", "Set color Visibility"); RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_MaterialGpencil_nopreview_update"); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index bbb6eae8945..aec0c016fa8 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -64,63 +64,63 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = { {0, "", 0, N_("Modify"), ""}, - {eModifierType_DataTransfer, "DATA_TRANSFER", ICON_MOD_DATA_TRANSFER, "Data Transfer", ""}, - {eModifierType_MeshCache, "MESH_CACHE", ICON_MOD_MESHDEFORM, "Mesh Cache", ""}, - {eModifierType_MeshSequenceCache, "MESH_SEQUENCE_CACHE", ICON_MOD_MESHDEFORM, "Mesh Sequence Cache", ""}, - {eModifierType_NormalEdit, "NORMAL_EDIT", ICON_MOD_NORMALEDIT, "Normal Edit", ""}, - {eModifierType_WeightedNormal, "WEIGHTED_NORMAL", ICON_MOD_NORMALEDIT, "Weighted Normal", ""}, - {eModifierType_UVProject, "UV_PROJECT", ICON_MOD_UVPROJECT, "UV Project", ""}, - {eModifierType_UVWarp, "UV_WARP", ICON_MOD_UVPROJECT, "UV Warp", ""}, - {eModifierType_WeightVGEdit, "VERTEX_WEIGHT_EDIT", ICON_MOD_VERTEX_WEIGHT, "Vertex Weight Edit", ""}, - {eModifierType_WeightVGMix, "VERTEX_WEIGHT_MIX", ICON_MOD_VERTEX_WEIGHT, "Vertex Weight Mix", ""}, - {eModifierType_WeightVGProximity, "VERTEX_WEIGHT_PROXIMITY", ICON_MOD_VERTEX_WEIGHT, + {eModifierType_DataTransfer, "DATA_TRANSFER", ICON_MODIFIER, "Data Transfer", ""}, + {eModifierType_MeshCache, "MESH_CACHE", ICON_MODIFIER, "Mesh Cache", ""}, + {eModifierType_MeshSequenceCache, "MESH_SEQUENCE_CACHE", ICON_MODIFIER, "Mesh Sequence Cache", ""}, + {eModifierType_NormalEdit, "NORMAL_EDIT", ICON_MODIFIER, "Normal Edit", ""}, + {eModifierType_WeightedNormal, "WEIGHTED_NORMAL", ICON_MODIFIER, "Weighted Normal", ""}, + {eModifierType_UVProject, "UV_PROJECT", ICON_MODIFIER, "UV Project", ""}, + {eModifierType_UVWarp, "UV_WARP", ICON_MODIFIER, "UV Warp", ""}, + {eModifierType_WeightVGEdit, "VERTEX_WEIGHT_EDIT", ICON_MODIFIER, "Vertex Weight Edit", ""}, + {eModifierType_WeightVGMix, "VERTEX_WEIGHT_MIX", ICON_MODIFIER, "Vertex Weight Mix", ""}, + {eModifierType_WeightVGProximity, "VERTEX_WEIGHT_PROXIMITY", ICON_MODIFIER, "Vertex Weight Proximity", ""}, {0, "", 0, N_("Generate"), ""}, - {eModifierType_Array, "ARRAY", ICON_MOD_ARRAY, "Array", ""}, - {eModifierType_Bevel, "BEVEL", ICON_MOD_BEVEL, "Bevel", ""}, - {eModifierType_Boolean, "BOOLEAN", ICON_MOD_BOOLEAN, "Boolean", ""}, - {eModifierType_Build, "BUILD", ICON_MOD_BUILD, "Build", ""}, - {eModifierType_Decimate, "DECIMATE", ICON_MOD_DECIM, "Decimate", ""}, - {eModifierType_EdgeSplit, "EDGE_SPLIT", ICON_MOD_EDGESPLIT, "Edge Split", ""}, - {eModifierType_Mask, "MASK", ICON_MOD_MASK, "Mask", ""}, - {eModifierType_Mirror, "MIRROR", ICON_MOD_MIRROR, "Mirror", ""}, - {eModifierType_Multires, "MULTIRES", ICON_MOD_MULTIRES, "Multiresolution", ""}, - {eModifierType_Remesh, "REMESH", ICON_MOD_REMESH, "Remesh", ""}, - {eModifierType_Screw, "SCREW", ICON_MOD_SCREW, "Screw", ""}, - {eModifierType_Skin, "SKIN", ICON_MOD_SKIN, "Skin", ""}, - {eModifierType_Solidify, "SOLIDIFY", ICON_MOD_SOLIDIFY, "Solidify", ""}, - {eModifierType_Subsurf, "SUBSURF", ICON_MOD_SUBSURF, "Subdivision Surface", ""}, - {eModifierType_Triangulate, "TRIANGULATE", ICON_MOD_TRIANGULATE, "Triangulate", ""}, - {eModifierType_Wireframe, "WIREFRAME", ICON_MOD_WIREFRAME, "Wireframe", "Generate a wireframe on the edges of a mesh"}, + {eModifierType_Array, "ARRAY", ICON_MODIFIER, "Array", ""}, + {eModifierType_Bevel, "BEVEL", ICON_MODIFIER, "Bevel", ""}, + {eModifierType_Boolean, "BOOLEAN", ICON_MODIFIER, "Boolean", ""}, + {eModifierType_Build, "BUILD", ICON_MODIFIER, "Build", ""}, + {eModifierType_Decimate, "DECIMATE", ICON_MODIFIER, "Decimate", ""}, + {eModifierType_EdgeSplit, "EDGE_SPLIT", ICON_MODIFIER, "Edge Split", ""}, + {eModifierType_Mask, "MASK", ICON_MODIFIER, "Mask", ""}, + {eModifierType_Mirror, "MIRROR", ICON_MODIFIER, "Mirror", ""}, + {eModifierType_Multires, "MULTIRES", ICON_MODIFIER, "Multiresolution", ""}, + {eModifierType_Remesh, "REMESH", ICON_MODIFIER, "Remesh", ""}, + {eModifierType_Screw, "SCREW", ICON_MODIFIER, "Screw", ""}, + {eModifierType_Skin, "SKIN", ICON_MODIFIER, "Skin", ""}, + {eModifierType_Solidify, "SOLIDIFY", ICON_MODIFIER, "Solidify", ""}, + {eModifierType_Subsurf, "SUBSURF", ICON_MODIFIER, "Subdivision Surface", ""}, + {eModifierType_Triangulate, "TRIANGULATE", ICON_MODIFIER, "Triangulate", ""}, + {eModifierType_Wireframe, "WIREFRAME", ICON_MODIFIER, "Wireframe", "Generate a wireframe on the edges of a mesh"}, {0, "", 0, N_("Deform"), ""}, - {eModifierType_Armature, "ARMATURE", ICON_MOD_ARMATURE, "Armature", ""}, - {eModifierType_Cast, "CAST", ICON_MOD_CAST, "Cast", ""}, - {eModifierType_CorrectiveSmooth, "CORRECTIVE_SMOOTH", ICON_MOD_SMOOTH, "Corrective Smooth", ""}, - {eModifierType_Curve, "CURVE", ICON_MOD_CURVE, "Curve", ""}, - {eModifierType_Displace, "DISPLACE", ICON_MOD_DISPLACE, "Displace", ""}, - {eModifierType_Hook, "HOOK", ICON_HOOK, "Hook", ""}, - {eModifierType_LaplacianSmooth, "LAPLACIANSMOOTH", ICON_MOD_SMOOTH, "Laplacian Smooth", ""}, - {eModifierType_LaplacianDeform, "LAPLACIANDEFORM", ICON_MOD_MESHDEFORM, "Laplacian Deform", ""}, - {eModifierType_Lattice, "LATTICE", ICON_MOD_LATTICE, "Lattice", ""}, - {eModifierType_MeshDeform, "MESH_DEFORM", ICON_MOD_MESHDEFORM, "Mesh Deform", ""}, - {eModifierType_Shrinkwrap, "SHRINKWRAP", ICON_MOD_SHRINKWRAP, "Shrinkwrap", ""}, - {eModifierType_SimpleDeform, "SIMPLE_DEFORM", ICON_MOD_SIMPLEDEFORM, "Simple Deform", ""}, - {eModifierType_Smooth, "SMOOTH", ICON_MOD_SMOOTH, "Smooth", ""}, - {eModifierType_SurfaceDeform, "SURFACE_DEFORM", ICON_MOD_MESHDEFORM, "Surface Deform", ""}, - {eModifierType_Warp, "WARP", ICON_MOD_WARP, "Warp", ""}, - {eModifierType_Wave, "WAVE", ICON_MOD_WAVE, "Wave", ""}, + {eModifierType_Armature, "ARMATURE", ICON_MODIFIER, "Armature", ""}, + {eModifierType_Cast, "CAST", ICON_MODIFIER, "Cast", ""}, + {eModifierType_Curve, "CURVE", ICON_MODIFIER, "Curve", ""}, + {eModifierType_Displace, "DISPLACE", ICON_MODIFIER, "Displace", ""}, + {eModifierType_Hook, "HOOK", ICON_MODIFIER, "Hook", ""}, + {eModifierType_LaplacianDeform, "LAPLACIANDEFORM", ICON_MODIFIER, "Laplacian Deform", ""}, + {eModifierType_Lattice, "LATTICE", ICON_MODIFIER, "Lattice", ""}, + {eModifierType_MeshDeform, "MESH_DEFORM", ICON_MODIFIER, "Mesh Deform", ""}, + {eModifierType_Shrinkwrap, "SHRINKWRAP", ICON_MODIFIER, "Shrinkwrap", ""}, + {eModifierType_SimpleDeform, "SIMPLE_DEFORM", ICON_MODIFIER, "Simple Deform", ""}, + {eModifierType_Smooth, "SMOOTH", ICON_MODIFIER, "Smooth", ""}, + {eModifierType_CorrectiveSmooth, "CORRECTIVE_SMOOTH", ICON_MODIFIER, "Smooth Corrective", ""}, + {eModifierType_LaplacianSmooth, "LAPLACIANSMOOTH", ICON_MODIFIER, "Smooth Laplacian", ""}, + {eModifierType_SurfaceDeform, "SURFACE_DEFORM", ICON_MODIFIER, "Surface Deform", ""}, + {eModifierType_Warp, "WARP", ICON_MODIFIER, "Warp", ""}, + {eModifierType_Wave, "WAVE", ICON_MODIFIER, "Wave", ""}, {0, "", 0, N_("Simulate"), ""}, - {eModifierType_Cloth, "CLOTH", ICON_MOD_CLOTH, "Cloth", ""}, - {eModifierType_Collision, "COLLISION", ICON_MOD_PHYSICS, "Collision", ""}, - {eModifierType_DynamicPaint, "DYNAMIC_PAINT", ICON_MOD_DYNAMICPAINT, "Dynamic Paint", ""}, - {eModifierType_Explode, "EXPLODE", ICON_MOD_EXPLODE, "Explode", ""}, - {eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MOD_FLUIDSIM, "Fluid Simulation", ""}, - {eModifierType_Ocean, "OCEAN", ICON_MOD_OCEAN, "Ocean", ""}, - {eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES, "Particle Instance", ""}, - {eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "Particle System", ""}, - {eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""}, - {eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""}, - {eModifierType_Surface, "SURFACE", ICON_MOD_PHYSICS, "Surface", ""}, + {eModifierType_Cloth, "CLOTH", ICON_MODIFIER, "Cloth", ""}, + {eModifierType_Collision, "COLLISION", ICON_MODIFIER, "Collision", ""}, + {eModifierType_DynamicPaint, "DYNAMIC_PAINT", ICON_MODIFIER, "Dynamic Paint", ""}, + {eModifierType_Explode, "EXPLODE", ICON_MODIFIER, "Explode", ""}, + {eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MODIFIER, "Fluid Simulation", ""}, + {eModifierType_Ocean, "OCEAN", ICON_MODIFIER, "Ocean", ""}, + {eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MODIFIER, "Particle Instance", ""}, + {eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MODIFIER, "Particle System", ""}, + {eModifierType_Smoke, "SMOKE", ICON_MODIFIER, "Smoke", ""}, + {eModifierType_Softbody, "SOFT_BODY", ICON_MODIFIER, "Soft Body", ""}, + {eModifierType_Surface, "SURFACE", ICON_MODIFIER, "Surface", ""}, {0, NULL, 0, NULL, NULL} }; diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 08da013754b..882cd50d6a8 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -185,9 +185,9 @@ const EnumPropertyItem rna_enum_snap_element_items[] = { const EnumPropertyItem rna_enum_snap_node_element_items[] = { {SCE_SNAP_MODE_GRID, "GRID", ICON_SNAP_GRID, "Grid", "Snap to grid"}, - {SCE_SNAP_MODE_NODE_X, "NODE_X", ICON_SNAP_EDGE, "Node X", "Snap to left/right node border"}, - {SCE_SNAP_MODE_NODE_Y, "NODE_Y", ICON_SNAP_EDGE, "Node Y", "Snap to top/bottom node border"}, - {SCE_SNAP_MODE_NODE_X | SCE_SNAP_MODE_NODE_Y, "NODE_XY", ICON_SNAP_EDGE, "Node X / Y", "Snap to any node border"}, + {SCE_SNAP_MODE_NODE_X, "NODE_X", ICON_NODE_SIDE, "Node X", "Snap to left/right node border"}, + {SCE_SNAP_MODE_NODE_Y, "NODE_Y", ICON_NODE_TOP, "Node Y", "Snap to top/bottom node border"}, + {SCE_SNAP_MODE_NODE_X | SCE_SNAP_MODE_NODE_Y, "NODE_XY", ICON_NODE_CORNER, "Node X / Y", "Snap to any node border"}, {0, NULL, 0, NULL, NULL} }; @@ -457,27 +457,27 @@ static const EnumPropertyItem rna_enum_gpencil_interpolation_mode_items[] = { #endif const EnumPropertyItem rna_enum_transform_pivot_items_full[] = { - {V3D_AROUND_CENTER_BOUNDS, "BOUNDING_BOX_CENTER", ICON_ROTATE, "Bounding Box Center", + {V3D_AROUND_CENTER_BOUNDS, "BOUNDING_BOX_CENTER", ICON_PIVOT_BOUNDBOX, "Bounding Box Center", "Pivot around bounding box center of selected object(s)"}, - {V3D_AROUND_CURSOR, "CURSOR", ICON_CURSOR, "3D Cursor", "Pivot around the 3D cursor"}, - {V3D_AROUND_LOCAL_ORIGINS, "INDIVIDUAL_ORIGINS", ICON_ROTATECOLLECTION, + {V3D_AROUND_CURSOR, "CURSOR", ICON_PIVOT_CURSOR, "3D Cursor", "Pivot around the 3D cursor"}, + {V3D_AROUND_LOCAL_ORIGINS, "INDIVIDUAL_ORIGINS", ICON_PIVOT_INDIVIDUAL, "Individual Origins", "Pivot around each object's own origin"}, - {V3D_AROUND_CENTER_MEAN, "MEDIAN_POINT", ICON_ROTATECENTER, "Median Point", + {V3D_AROUND_CENTER_MEAN, "MEDIAN_POINT", ICON_PIVOT_MEDIAN, "Median Point", "Pivot around the median point of selected objects"}, - {V3D_AROUND_ACTIVE, "ACTIVE_ELEMENT", ICON_ROTACTIVE, "Active Element", "Pivot around active object"}, + {V3D_AROUND_ACTIVE, "ACTIVE_ELEMENT", ICON_PIVOT_ACTIVE, "Active Element", "Pivot around active object"}, {0, NULL, 0, NULL, NULL} }; /* Icons could be made a consistent set of images. */ const EnumPropertyItem rna_enum_transform_orientation_items[] = { - {V3D_MANIP_GLOBAL, "GLOBAL", ICON_SCENE_DATA, "Global", "Align the transformation axes to world space"}, - {V3D_MANIP_LOCAL, "LOCAL", ICON_MANIPUL, "Local", "Align the transformation axes to the selected objects' local space"}, - {V3D_MANIP_NORMAL, "NORMAL", ICON_SNAP_NORMAL, "Normal", + {V3D_MANIP_GLOBAL, "GLOBAL", ICON_ORIENTATION_GLOBAL, "Global", "Align the transformation axes to world space"}, + {V3D_MANIP_LOCAL, "LOCAL", ICON_ORIENTATION_LOCAL, "Local", "Align the transformation axes to the selected objects' local space"}, + {V3D_MANIP_NORMAL, "NORMAL", ICON_ORIENTATION_NORMAL, "Normal", "Align the transformation axes to average normal of selected elements " "(bone Y axis for pose mode)"}, - {V3D_MANIP_GIMBAL, "GIMBAL", ICON_NDOF_DOM, "Gimbal", "Align each axis to the Euler rotation axis as used for input"}, - {V3D_MANIP_VIEW, "VIEW", ICON_VISIBLE_IPO_ON, "View", "Align the transformation axes to the window"}, - {V3D_MANIP_CURSOR, "CURSOR", ICON_CURSOR, "Cursor", "Align the transformation axes to the 3D cursor"}, + {V3D_MANIP_GIMBAL, "GIMBAL", ICON_ORIENTATION_GIMBAL, "Gimbal", "Align each axis to the Euler rotation axis as used for input"}, + {V3D_MANIP_VIEW, "VIEW", ICON_ORIENTATION_VIEW, "View", "Align the transformation axes to the window"}, + {V3D_MANIP_CURSOR, "CURSOR", ICON_PIVOT_CURSOR, "Cursor", "Align the transformation axes to the 3D cursor"}, // {V3D_MANIP_CUSTOM, "CUSTOM", 0, "Custom", "Use a custom transform orientation"}, {0, NULL, 0, NULL, NULL} }; @@ -2214,7 +2214,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) static const EnumPropertyItem gpencil_stroke_placement_items[] = { {GP_PROJECT_VIEWSPACE, "ORIGIN", ICON_OBJECT_ORIGIN, "Origin", "Draw stroke at Object origin"}, - {GP_PROJECT_VIEWSPACE | GP_PROJECT_CURSOR, "CURSOR", ICON_CURSOR, "3D Cursor", "Draw stroke at 3D cursor location" }, + {GP_PROJECT_VIEWSPACE | GP_PROJECT_CURSOR, "CURSOR", ICON_PIVOT_CURSOR, "3D Cursor", "Draw stroke at 3D cursor location" }, {GP_PROJECT_VIEWSPACE | GP_PROJECT_DEPTH_VIEW, "SURFACE", ICON_FACESEL, "Surface", "Stick stroke to surfaces"}, {0, NULL, 0, NULL, NULL} }; @@ -2226,7 +2226,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) }; static const EnumPropertyItem annotation_stroke_placement_items[] = { - {GP_PROJECT_VIEWSPACE | GP_PROJECT_CURSOR, "CURSOR", ICON_CURSOR, "3D Cursor", "Draw stroke at 3D cursor location" }, + {GP_PROJECT_VIEWSPACE | GP_PROJECT_CURSOR, "CURSOR", ICON_PIVOT_CURSOR, "3D Cursor", "Draw stroke at 3D cursor location" }, {0, "VIEW", ICON_VISIBLE_IPO_ON, "View", "Stick stroke to the view "}, /* weird, GP_PROJECT_VIEWALIGN is inverted */ {GP_PROJECT_VIEWSPACE | GP_PROJECT_DEPTH_VIEW, "SURFACE", ICON_FACESEL, "Surface", "Stick stroke to surfaces"}, /* Stroke option is disabled because is not working as expected and maybe is not @@ -2390,7 +2390,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "use_transform_pivot_point_align", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "transform_flag", SCE_XFORM_AXIS_ALIGN); RNA_def_property_ui_text(prop, "Align", "Manipulate center points (object, pose and weight paint mode only)"); - RNA_def_property_ui_icon(prop, ICON_ALIGN, 0); + RNA_def_property_ui_icon(prop, ICON_CENTER_ONLY, 0); RNA_def_property_update(prop, NC_SCENE, NULL); prop = RNA_def_property(srna, "use_mesh_automerge", PROP_BOOLEAN, PROP_NONE); @@ -2460,7 +2460,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "use_snap_self", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "snap_flag", SCE_SNAP_NO_SELF); RNA_def_property_ui_text(prop, "Project to Self", "Snap onto itself (editmode)"); - RNA_def_property_ui_icon(prop, ICON_ORTHO, 0); + RNA_def_property_ui_icon(prop, ICON_XRAY, 0); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */ prop = RNA_def_property(srna, "use_gizmo_mode", PROP_ENUM, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c index f9dedc73280..05e5587c9c4 100644 --- a/source/blender/makesrna/intern/rna_screen.c +++ b/source/blender/makesrna/intern/rna_screen.c @@ -519,7 +519,7 @@ static void rna_def_screen(BlenderRNA *brna) srna = RNA_def_struct(brna, "Screen", "ID"); RNA_def_struct_sdna(srna, "Screen"); /* it is actually bScreen but for 2.5 the dna is patched! */ RNA_def_struct_ui_text(srna, "Screen", "Screen data-block, defining the layout of areas in a window"); - RNA_def_struct_ui_icon(srna, ICON_SPLITSCREEN); + RNA_def_struct_ui_icon(srna, ICON_WORKSPACE); prop = RNA_def_property(srna, "layout_name", PROP_STRING, PROP_NONE); RNA_def_property_string_funcs(prop, "rna_Screen_layout_name_get", "rna_Screen_layout_name_length", diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index 6ab591fb332..40177d4d45c 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -85,9 +85,9 @@ static EnumPropertyItem rna_enum_gpencil_weight_brush_items[] = { static const EnumPropertyItem rna_enum_gpencil_lockaxis_items[] = { { GP_LOCKAXIS_NONE, "GP_LOCKAXIS_NONE", ICON_UNLOCKED, "None", "" }, - { GP_LOCKAXIS_X, "GP_LOCKAXIS_X", ICON_NDOF_DOM, "Y-Z Plane", "Project strokes to plane locked to X" }, - { GP_LOCKAXIS_Y, "GP_LOCKAXIS_Y", ICON_NDOF_DOM, "X-Z Plane", "Project strokes to plane locked to Y" }, - { GP_LOCKAXIS_Z, "GP_LOCKAXIS_Z", ICON_NDOF_DOM, "X-Y Plane", "Project strokes to plane locked to Z" }, + { GP_LOCKAXIS_X, "GP_LOCKAXIS_X", ICON_AXIS_SIDE, "Y-Z Plane", "Project strokes to plane locked to X" }, + { GP_LOCKAXIS_Y, "GP_LOCKAXIS_Y", ICON_AXIS_FRONT, "X-Z Plane", "Project strokes to plane locked to Y" }, + { GP_LOCKAXIS_Z, "GP_LOCKAXIS_Z", ICON_AXIS_TOP, "X-Y Plane", "Project strokes to plane locked to Z" }, { 0, NULL, 0, NULL, NULL } }; #endif @@ -1103,8 +1103,8 @@ static void rna_def_particle_edit(BlenderRNA *brna) static void rna_def_gpencil_sculpt(BlenderRNA *brna) { static const EnumPropertyItem prop_direction_items[] = { - {0, "ADD", ICON_ZOOMIN, "Add", "Add effect of brush"}, - {GP_EDITBRUSH_FLAG_INVERT, "SUBTRACT", ICON_ZOOMOUT, "Subtract", "Subtract effect of brush"}, + {0, "ADD", ICON_ADD, "Add", "Add effect of brush"}, + {GP_EDITBRUSH_FLAG_INVERT, "SUBTRACT", ICON_REMOVE, "Subtract", "Subtract effect of brush"}, {0, NULL, 0, NULL, NULL}}; StructRNA *srna; diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 92555c54eb4..80053095044 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -72,7 +72,7 @@ const EnumPropertyItem rna_enum_space_type_items[] = { /* General */ {0, "", ICON_NONE, "General", ""}, {SPACE_VIEW3D, "VIEW_3D", ICON_VIEW3D, "3D View", "3D viewport"}, - {SPACE_IMAGE, "IMAGE_EDITOR", ICON_IMAGE_COL, "UV/Image Editor", "View and edit images and UV Maps"}, + {SPACE_IMAGE, "IMAGE_EDITOR", ICON_IMAGE, "UV/Image Editor", "View and edit images and UV Maps"}, {SPACE_NODE, "NODE_EDITOR", ICON_NODETREE, "Node Editor", "Editor for node-based shading and compositing tools"}, {SPACE_SEQ, "SEQUENCE_EDITOR", ICON_SEQUENCE, "Video Sequencer", "Video editing tools"}, {SPACE_CLIP, "CLIP_EDITOR", ICON_CLIP, "Movie Clip Editor", "Motion tracking tools"}, @@ -81,7 +81,7 @@ const EnumPropertyItem rna_enum_space_type_items[] = { {0, "", ICON_NONE, "Animation", ""}, //{SPACE_ACTION, "TIMELINE", ICON_TIME, "Timeline", "Timeline and playback controls (NOTE: Switch to 'Timeline' mode)"}, /* XXX */ {SPACE_ACTION, "DOPESHEET_EDITOR", ICON_ACTION, "Dope Sheet", "Adjust timing of keyframes"}, - {SPACE_IPO, "GRAPH_EDITOR", ICON_IPO, "Graph Editor", "Edit drivers and keyframe interpolation"}, + {SPACE_IPO, "GRAPH_EDITOR", ICON_GRAPH, "Graph Editor", "Edit drivers and keyframe interpolation"}, {SPACE_NLA, "NLA_EDITOR", ICON_NLA, "Nonlinear Animation", "Combine and layer Actions"}, /* Scripting */ @@ -99,16 +99,16 @@ const EnumPropertyItem rna_enum_space_type_items[] = { /* Data */ {0, "", ICON_NONE, "Data", ""}, - {SPACE_OUTLINER, "OUTLINER", ICON_OOPS, "Outliner", "Overview of scene graph and all available data-blocks"}, - {SPACE_BUTS, "PROPERTIES", ICON_BUTS, "Properties", "Edit properties of active object and related data-blocks"}, - {SPACE_FILE, "FILE_BROWSER", ICON_FILESEL, "File Browser", "Browse for files and assets"}, + {SPACE_OUTLINER, "OUTLINER", ICON_OUTLINER, "Outliner", "Overview of scene graph and all available data-blocks"}, + {SPACE_BUTS, "PROPERTIES", ICON_PROPERTIES, "Properties", "Edit properties of active object and related data-blocks"}, + {SPACE_FILE, "FILE_BROWSER", ICON_FILEBROWSER, "File Browser", "Browse for files and assets"}, {SPACE_USERPREF, "USER_PREFERENCES", ICON_PREFERENCES, "User Preferences", "Edit persistent configuration settings"}, {0, NULL, 0, NULL, NULL} }; const EnumPropertyItem rna_enum_space_graph_mode_items[] = { - {SIPO_MODE_ANIMATION, "FCURVES", ICON_IPO, "Graph Editor", + {SIPO_MODE_ANIMATION, "FCURVES", ICON_GRAPH, "Graph Editor", "Edit animation/keyframes displayed as 2D curves"}, {SIPO_MODE_DRIVERS, "DRIVERS", ICON_DRIVER, "Drivers", "Edit drivers"}, {0, NULL, 0, NULL, NULL} @@ -238,10 +238,10 @@ static const EnumPropertyItem autosnap_items[] = { #endif const EnumPropertyItem rna_enum_shading_type_items[] = { - {OB_WIRE, "WIREFRAME", ICON_WIRE, "Wireframe", "Display the object as wire edges"}, - {OB_SOLID, "SOLID", ICON_SOLID, "Solid", "Display in solid mode"}, - {OB_MATERIAL, "MATERIAL", ICON_MATERIAL_DATA, "LookDev", "Display in LookDev mode"}, - {OB_RENDER, "RENDERED", ICON_SMOOTH, "Rendered", "Display render preview"}, + {OB_WIRE, "WIREFRAME", ICON_SHADING_WIRE, "Wireframe", "Display the object as wire edges"}, + {OB_SOLID, "SOLID", ICON_SHADING_SOLID, "Solid", "Display in solid mode"}, + {OB_MATERIAL, "MATERIAL", ICON_SHADING_TEXTURE, "LookDev", "Display in LookDev mode"}, + {OB_RENDER, "RENDERED", ICON_SHADING_RENDERED, "Rendered", "Display render preview"}, {0, NULL, 0, NULL, NULL} }; @@ -1197,10 +1197,10 @@ static const EnumPropertyItem *rna_SpaceImageEditor_pivot_itemf( PropertyRNA *UNUSED(prop), bool *UNUSED(r_free)) { static const EnumPropertyItem pivot_items[] = { - {V3D_AROUND_CENTER_BOUNDS, "CENTER", ICON_ROTATE, "Bounding Box Center", ""}, - {V3D_AROUND_CENTER_MEAN, "MEDIAN", ICON_ROTATECENTER, "Median Point", ""}, - {V3D_AROUND_CURSOR, "CURSOR", ICON_CURSOR, "2D Cursor", ""}, - {V3D_AROUND_LOCAL_ORIGINS, "INDIVIDUAL_ORIGINS", ICON_ROTATECOLLECTION, + {V3D_AROUND_CENTER_BOUNDS, "CENTER", ICON_PIVOT_BOUNDBOX, "Bounding Box Center", ""}, + {V3D_AROUND_CENTER_MEAN, "MEDIAN", ICON_PIVOT_MEDIAN, "Median Point", ""}, + {V3D_AROUND_CURSOR, "CURSOR", ICON_PIVOT_CURSOR, "2D Cursor", ""}, + {V3D_AROUND_LOCAL_ORIGINS, "INDIVIDUAL_ORIGINS", ICON_PIVOT_INDIVIDUAL, "Individual Origins", "Pivot around each selected island's own median point"}, {0, NULL, 0, NULL, NULL} }; @@ -2295,7 +2295,7 @@ static void rna_def_space_outliner(BlenderRNA *brna) {SO_SEQUENCE, "SEQUENCE", ICON_SEQUENCE, "Sequence", "Display sequence data-blocks"}, {SO_LIBRARIES, "LIBRARIES", ICON_FILE_BLEND, "Blender File", "Display data of current file and linked libraries"}, {SO_DATA_API, "DATA_API", ICON_RNA, "Data API", "Display low level Blender data and its properties"}, - {SO_ID_ORPHANS, "ORPHAN_DATA", ICON_EXTERNAL_DATA, "Orphan Data", + {SO_ID_ORPHANS, "ORPHAN_DATA", ICON_ORPHAN_DATA, "Orphan Data", "Display data-blocks which are unused and/or will be lost when the file is reloaded"}, {0, NULL, 0, NULL, NULL} }; @@ -4032,9 +4032,9 @@ static void rna_def_space_graph(BlenderRNA *brna) /* this is basically the same as the one for the 3D-View, but with some entries omitted */ static const EnumPropertyItem gpivot_items[] = { - {V3D_AROUND_CENTER_BOUNDS, "BOUNDING_BOX_CENTER", ICON_ROTATE, "Bounding Box Center", ""}, - {V3D_AROUND_CURSOR, "CURSOR", ICON_CURSOR, "2D Cursor", ""}, - {V3D_AROUND_LOCAL_ORIGINS, "INDIVIDUAL_ORIGINS", ICON_ROTATECOLLECTION, "Individual Centers", ""}, + {V3D_AROUND_CENTER_BOUNDS, "BOUNDING_BOX_CENTER", ICON_PIVOT_BOUNDBOX, "Bounding Box Center", ""}, + {V3D_AROUND_CURSOR, "CURSOR", ICON_PIVOT_CURSOR, "2D Cursor", ""}, + {V3D_AROUND_LOCAL_ORIGINS, "INDIVIDUAL_ORIGINS", ICON_PIVOT_INDIVIDUAL, "Individual Centers", ""}, /*{V3D_AROUND_CENTER_MEAN, "MEDIAN_POINT", 0, "Median Point", ""}, */ /*{V3D_AROUND_ACTIVE, "ACTIVE_ELEMENT", 0, "Active Element", ""}, */ {0, NULL, 0, NULL, NULL} @@ -4926,7 +4926,7 @@ static void rna_def_space_clip(BlenderRNA *brna) static const EnumPropertyItem view_items[] = { {SC_VIEW_CLIP, "CLIP", ICON_SEQUENCE, "Clip", "Show editing clip preview"}, - {SC_VIEW_GRAPH, "GRAPH", ICON_IPO, "Graph", "Show graph view for active element"}, + {SC_VIEW_GRAPH, "GRAPH", ICON_GRAPH, "Graph", "Show graph view for active element"}, {SC_VIEW_DOPESHEET, "DOPESHEET", ICON_ACTION, "Dopesheet", "Dopesheet view for tracking data"}, {0, NULL, 0, NULL, NULL} }; @@ -4938,12 +4938,12 @@ static void rna_def_space_clip(BlenderRNA *brna) }; static const EnumPropertyItem pivot_items[] = { - {V3D_AROUND_CENTER_BOUNDS, "BOUNDING_BOX_CENTER", ICON_ROTATE, "Bounding Box Center", + {V3D_AROUND_CENTER_BOUNDS, "BOUNDING_BOX_CENTER", ICON_PIVOT_BOUNDBOX, "Bounding Box Center", "Pivot around bounding box center of selected object(s)"}, - {V3D_AROUND_CURSOR, "CURSOR", ICON_CURSOR, "2D Cursor", "Pivot around the 2D cursor"}, - {V3D_AROUND_LOCAL_ORIGINS, "INDIVIDUAL_ORIGINS", ICON_ROTATECOLLECTION, + {V3D_AROUND_CURSOR, "CURSOR", ICON_PIVOT_CURSOR, "2D Cursor", "Pivot around the 2D cursor"}, + {V3D_AROUND_LOCAL_ORIGINS, "INDIVIDUAL_ORIGINS", ICON_CENTER_ONLY, "Individual Origins", "Pivot around each object's own origin"}, - {V3D_AROUND_CENTER_MEAN, "MEDIAN_POINT", ICON_ROTATECENTER, "Median Point", + {V3D_AROUND_CENTER_MEAN, "MEDIAN_POINT", ICON_PIVOT_MEDIAN, "Median Point", "Pivot around the median point of selected objects"}, {0, NULL, 0, NULL, NULL} }; diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index ec0349e2a4b..c3207be380f 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -49,7 +49,7 @@ #define DEF_ICON(name) {ICON_##name, (#name), 0, (#name), ""}, #define DEF_ICON_VECTOR(name) {ICON_##name, (#name), 0, (#name), ""}, -#define DEF_ICON_MONO(name) {ICON_##name, (#name), 0, (#name), ""}, +#define DEF_ICON_COLOR(name) {ICON_##name, (#name), 0, (#name), ""}, #define DEF_ICON_BLANK(name) const EnumPropertyItem rna_enum_icon_items[] = { #include "UI_icons.h" @@ -57,7 +57,7 @@ const EnumPropertyItem rna_enum_icon_items[] = { }; #undef DEF_ICON #undef DEF_ICON_VECTOR -#undef DEF_ICON_MONO +#undef DEF_ICON_COLOR #undef DEF_ICON_BLANK #ifdef RNA_RUNTIME diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 5eee0ccec37..576833c5fc9 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -3087,22 +3087,22 @@ static void rna_def_userdef_themes(BlenderRNA *brna) PropertyRNA *prop; static const EnumPropertyItem active_theme_area[] = { - {0, "USER_INTERFACE", ICON_UI, "User Interface", ""}, + {0, "USER_INTERFACE", ICON_WORKSPACE, "User Interface", ""}, {19, "STYLE", ICON_FONTPREVIEW, "Text Style", ""}, {18, "BONE_COLOR_SETS", ICON_COLOR, "Bone Color Sets", ""}, {1, "VIEW_3D", ICON_VIEW3D, "3D View", ""}, - {3, "GRAPH_EDITOR", ICON_IPO, "Graph Editor", ""}, + {3, "GRAPH_EDITOR", ICON_GRAPH, "Graph Editor", ""}, {4, "DOPESHEET_EDITOR", ICON_ACTION, "Dope Sheet", ""}, {5, "NLA_EDITOR", ICON_NLA, "Nonlinear Animation", ""}, - {6, "IMAGE_EDITOR", ICON_IMAGE_COL, "UV/Image Editor", ""}, + {6, "IMAGE_EDITOR", ICON_IMAGE, "UV/Image Editor", ""}, {7, "SEQUENCE_EDITOR", ICON_SEQUENCE, "Video Sequence Editor", ""}, {8, "TEXT_EDITOR", ICON_TEXT, "Text Editor", ""}, {9, "NODE_EDITOR", ICON_NODETREE, "Node Editor", ""}, - {11, "PROPERTIES", ICON_BUTS, "Properties", ""}, - {12, "OUTLINER", ICON_OOPS, "Outliner", ""}, + {11, "PROPERTIES", ICON_PROPERTIES, "Properties", ""}, + {12, "OUTLINER", ICON_OUTLINER, "Outliner", ""}, {14, "USER_PREFERENCES", ICON_PREFERENCES, "User Preferences", ""}, {15, "INFO", ICON_INFO, "Info", ""}, - {16, "FILE_BROWSER", ICON_FILESEL, "File Browser", ""}, + {16, "FILE_BROWSER", ICON_FILEBROWSER, "File Browser", ""}, {17, "CONSOLE", ICON_CONSOLE, "Python Console", ""}, {20, "CLIP_EDITOR", ICON_CLIP, "Movie Clip Editor", ""}, {21, "TOPBAR", ICON_NONE, "Top Bar", ""}, diff --git a/source/blender/makesrna/intern/rna_workspace.c b/source/blender/makesrna/intern/rna_workspace.c index e900b51c4eb..5504ca68c6d 100644 --- a/source/blender/makesrna/intern/rna_workspace.c +++ b/source/blender/makesrna/intern/rna_workspace.c @@ -294,7 +294,7 @@ static void rna_def_workspace(BlenderRNA *brna) RNA_def_struct_sdna(srna, "WorkSpace"); RNA_def_struct_ui_text(srna, "Workspace", "Workspace data-block, defining the working environment for the user"); /* TODO: real icon, just to show something */ - RNA_def_struct_ui_icon(srna, ICON_SPLITSCREEN); + RNA_def_struct_ui_icon(srna, ICON_WORKSPACE); prop = RNA_def_property(srna, "screens", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "layouts", NULL); diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 965b1870838..a52b97254be 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -1725,7 +1725,7 @@ static int wm_homefile_read_exec(bContext *C, wmOperator *op) static int wm_homefile_read_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event)) { /* Draw menu which includes default startup and application templates. */ - uiPopupMenu *pup = UI_popup_menu_begin(C, IFACE_("New File"), ICON_FILE); + uiPopupMenu *pup = UI_popup_menu_begin(C, IFACE_("New File"), ICON_FILE_NEW); uiLayout *layout = UI_popup_menu_layout(pup); MenuType *mt = WM_menutype_find("TOPBAR_MT_file_new", false); |