forked from bartvdbraak/blender
Updated icons. Changed some icon names that weren't blank.
This commit is contained in:
parent
158534d404
commit
d80074f18c
Binary file not shown.
Before Width: | Height: | Size: 186 KiB After Width: | Height: | Size: 191 KiB |
@ -82,9 +82,9 @@ class DATA_PT_vertex_groups(DataButtonsPanel):
|
||||
col.itemO("object.vertex_group_add", icon='ICON_ZOOMIN', text="")
|
||||
col.itemO("object.vertex_group_remove", icon='ICON_ZOOMOUT', text="")
|
||||
|
||||
col.itemO("object.vertex_group_copy", icon='ICON_COPYDOWN', text="")
|
||||
col.itemO("object.vertex_group_copy", icon='ICON_COPY_ID', text="")
|
||||
if ob.data.users > 1:
|
||||
col.itemO("object.vertex_group_copy_to_linked", icon='ICON_COPYDOWN', text="")
|
||||
col.itemO("object.vertex_group_copy_to_linked", icon='ICON_LINK_AREA', text="")
|
||||
|
||||
group = ob.active_vertex_group
|
||||
if group:
|
||||
|
@ -59,7 +59,7 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel):
|
||||
col = row.column(align=True)
|
||||
col.itemO("object.material_slot_add", icon='ICON_ZOOMIN', text="")
|
||||
col.itemO("object.material_slot_remove", icon='ICON_ZOOMOUT', text="")
|
||||
col.itemO("object.material_slot_copy", icon='ICON_COPYDOWN', text="")
|
||||
col.itemO("object.material_slot_copy", icon='ICON_COPY_ID', text="")
|
||||
|
||||
if ob.mode == 'EDIT':
|
||||
row = layout.row(align=True)
|
||||
|
@ -12,11 +12,17 @@ class FILEBROWSER_HT_header(bpy.types.Header):
|
||||
|
||||
layout.template_header(menus=False)
|
||||
|
||||
row = layout.row()
|
||||
row.itemS()
|
||||
|
||||
row = layout.row(align=True)
|
||||
row.itemO("file.previous", text="", icon='ICON_BACK')
|
||||
row.itemO("file.next", text="", icon='ICON_FORWARD')
|
||||
row.itemO("file.parent", text="", icon='ICON_FILE_PARENT')
|
||||
row.itemO("file.refresh", text="", icon='ICON_FILE_REFRESH')
|
||||
row.itemO("file.previous", text="", icon='ICON_PREV_KEYFRAME')
|
||||
row.itemO("file.next", text="", icon='ICON_NEXT_KEYFRAME')
|
||||
|
||||
row = layout.row()
|
||||
row.itemS()
|
||||
|
||||
row = layout.row(align=True)
|
||||
row.itemO("file.directory_new", text="", icon='ICON_NEWFOLDER')
|
||||
@ -24,8 +30,8 @@ class FILEBROWSER_HT_header(bpy.types.Header):
|
||||
layout.itemR(params, "display", expand=True, text="")
|
||||
layout.itemR(params, "sort", expand=True, text="")
|
||||
|
||||
layout.itemR(params, "hide_dot")
|
||||
layout.itemR(params, "do_filter")
|
||||
layout.itemR(params, "hide_dot", text="Hide Invisible")
|
||||
layout.itemR(params, "do_filter", text="", icon='ICON_FILTER')
|
||||
|
||||
row = layout.row(align=True)
|
||||
row.itemR(params, "filter_folder", text="");
|
||||
|
@ -48,19 +48,19 @@ class INFO_MT_file(bpy.types.Menu):
|
||||
layout = self.layout
|
||||
|
||||
layout.operator_context = "EXEC_AREA"
|
||||
layout.itemO("wm.read_homefile", text="New")
|
||||
layout.itemO("wm.read_homefile", text="New", icon='ICON_NEW')
|
||||
layout.operator_context = "INVOKE_AREA"
|
||||
layout.itemO("wm.open_mainfile", text="Open...")
|
||||
layout.itemO("wm.open_mainfile", text="Open...", icon='ICON_FILE_FOLDER')
|
||||
layout.item_menu_enumO("wm.open_recentfile", "file", text="Open Recent")
|
||||
layout.itemO("wm.recover_last_session")
|
||||
|
||||
layout.itemS()
|
||||
|
||||
layout.operator_context = "EXEC_AREA"
|
||||
layout.itemO("wm.save_mainfile", text="Save")
|
||||
layout.itemO("wm.save_mainfile", text="Save", icon='ICON_FILE_TICK')
|
||||
layout.operator_context = "INVOKE_AREA"
|
||||
layout.itemO("wm.save_as_mainfile", text="Save As...")
|
||||
layout.itemO("screen.userpref_show", text="User Preferences...")
|
||||
layout.itemO("screen.userpref_show", text="User Preferences...", icon='ICON_PREFERENCES')
|
||||
|
||||
layout.itemS()
|
||||
layout.operator_context = "INVOKE_AREA"
|
||||
@ -78,7 +78,7 @@ class INFO_MT_file(bpy.types.Menu):
|
||||
layout.itemS()
|
||||
|
||||
layout.operator_context = "EXEC_AREA"
|
||||
layout.itemO("wm.exit_blender", text="Quit")
|
||||
layout.itemO("wm.exit_blender", text="Quit", icon='ICON_QUIT')
|
||||
|
||||
|
||||
# test for expanding menus
|
||||
@ -212,7 +212,7 @@ class INFO_MT_help(bpy.types.Menu):
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
|
||||
layout.itemO("help.manual", icon='ICON_URL')
|
||||
layout.itemO("help.manual", icon='ICON_HELP')
|
||||
layout.itemO("help.release_logs", icon='ICON_URL')
|
||||
|
||||
layout.itemS()
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -33,7 +33,7 @@
|
||||
DEF_ICON(ICON_BLENDER)
|
||||
DEF_ICON(ICON_QUESTION)
|
||||
DEF_ICON(ICON_ERROR)
|
||||
DEF_ICON(ICON_BLANK1) // XXX this is used lots, it's not actually 'blank'
|
||||
DEF_ICON(ICON_CANCEL)
|
||||
DEF_ICON(ICON_TRIA_RIGHT)
|
||||
DEF_ICON(ICON_TRIA_DOWN)
|
||||
DEF_ICON(ICON_TRIA_LEFT)
|
||||
@ -66,9 +66,9 @@ DEF_ICON(ICON_VIEWZOOM)
|
||||
DEF_ICON(ICON_ZOOMIN)
|
||||
DEF_ICON(ICON_ZOOMOUT)
|
||||
DEF_ICON(ICON_PANEL_CLOSE)
|
||||
DEF_ICON(ICON_BLANK009)
|
||||
DEF_ICON(ICON_COPY_ID) //ICON_BLANK009
|
||||
DEF_ICON(ICON_EYEDROPPER)
|
||||
DEF_ICON(ICON_BLANK010)
|
||||
DEF_ICON(ICON_LINK_AREA) //ICON_BLANK010
|
||||
DEF_ICON(ICON_AUTO)
|
||||
DEF_ICON(ICON_CHECKBOX_DEHLT)
|
||||
DEF_ICON(ICON_CHECKBOX_HLT)
|
||||
@ -83,7 +83,7 @@ DEF_ICON(ICON_DOTSUP)
|
||||
DEF_ICON(ICON_DOTSDOWN)
|
||||
DEF_ICON(ICON_LINK)
|
||||
DEF_ICON(ICON_INLINK)
|
||||
DEF_ICON(ICON_BLANK012b)
|
||||
DEF_ICON(ICON_PLUGIN)
|
||||
|
||||
/* various ui */
|
||||
DEF_ICON(ICON_HELP)
|
||||
@ -105,13 +105,13 @@ DEF_ICON(ICON_STYLUS_PRESSURE)
|
||||
DEF_ICON(ICON_GHOST_DISABLED)
|
||||
DEF_ICON(ICON_NEW)
|
||||
DEF_ICON(ICON_FILE_TICK)
|
||||
DEF_ICON(ICON_CANCEL)
|
||||
DEF_ICON(ICON_QUIT)
|
||||
DEF_ICON(ICON_URL)
|
||||
DEF_ICON(ICON_BLANK037)
|
||||
DEF_ICON(ICON_BLANK038)
|
||||
DEF_ICON(ICON_BLANK039)
|
||||
DEF_ICON(ICON_BLANK040)
|
||||
DEF_ICON(ICON_BLANK040b)
|
||||
DEF_ICON(ICON_BLANK1) // Not actually blank - this is used all over the place
|
||||
|
||||
/* BUTTONS */
|
||||
DEF_ICON(ICON_LAMP)
|
||||
@ -127,7 +127,7 @@ DEF_ICON(ICON_SCRIPT)
|
||||
DEF_ICON(ICON_PARTICLES)
|
||||
DEF_ICON(ICON_PHYSICS)
|
||||
DEF_ICON(ICON_SPEAKER)
|
||||
DEF_ICON(ICON_BLANK041)
|
||||
DEF_ICON(ICON_TEXTURE_SHADED) //ICON_BLANK041
|
||||
DEF_ICON(ICON_BLANK042)
|
||||
DEF_ICON(ICON_BLANK043)
|
||||
DEF_ICON(ICON_BLANK044)
|
||||
@ -251,7 +251,7 @@ DEF_ICON(ICON_GROUP_UVS)
|
||||
DEF_ICON(ICON_BLANK089)
|
||||
DEF_ICON(ICON_BLANK090)
|
||||
DEF_ICON(ICON_RNA)
|
||||
DEF_ICON(ICON_BLANK090b)
|
||||
DEF_ICON(ICON_RNA_ADD)
|
||||
|
||||
/* available */
|
||||
DEF_ICON(ICON_BLANK092)
|
||||
@ -690,7 +690,7 @@ DEF_ICON(ICON_UV_VERTEXSEL)
|
||||
DEF_ICON(ICON_UV_EDGESEL)
|
||||
DEF_ICON(ICON_UV_FACESEL)
|
||||
DEF_ICON(ICON_UV_ISLANDSEL)
|
||||
DEF_ICON(ICON_BLANK239)
|
||||
DEF_ICON(ICON_UV_SYNC_SELECT)
|
||||
DEF_ICON(ICON_BLANK240)
|
||||
DEF_ICON(ICON_BLANK241)
|
||||
DEF_ICON(ICON_BLANK242)
|
||||
@ -801,8 +801,8 @@ DEF_ICON(ICON_BLANK303)
|
||||
DEF_ICON(ICON_BLANK304)
|
||||
DEF_ICON(ICON_BLANK305)
|
||||
DEF_ICON(ICON_BLANK306)
|
||||
DEF_ICON(ICON_BLANK307)
|
||||
DEF_ICON(ICON_BLANK308)
|
||||
DEF_ICON(ICON_BACK)
|
||||
DEF_ICON(ICON_FORWARD)
|
||||
DEF_ICON(ICON_BLANK309)
|
||||
DEF_ICON(ICON_BLANK310)
|
||||
DEF_ICON(ICON_BLANK311)
|
||||
|
@ -2266,11 +2266,11 @@ void uiTemplateRunningJobs(uiLayout *layout, bContext *C)
|
||||
uiBlockSetHandleFunc(block, do_running_jobs, NULL);
|
||||
|
||||
if(WM_jobs_test(wm, scene))
|
||||
uiDefIconTextBut(block, BUT, B_STOPRENDER, ICON_REC, "Render", 0,0,75,UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, "Stop rendering");
|
||||
uiDefIconTextBut(block, BUT, B_STOPRENDER, ICON_CANCEL, "Render", 0,0,75,UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, "Stop rendering");
|
||||
if(WM_jobs_test(wm, screen))
|
||||
uiDefIconTextBut(block, BUT, B_STOPCAST, ICON_REC, "Capture", 0,0,85,UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, "Stop screencast");
|
||||
uiDefIconTextBut(block, BUT, B_STOPCAST, ICON_CANCEL, "Capture", 0,0,85,UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, "Stop screencast");
|
||||
if(screen->animtimer)
|
||||
uiDefIconTextBut(block, BUT, B_STOPANIM, ICON_REC, "Anim Player", 0,0,85,UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, "Stop animation playback");
|
||||
uiDefIconTextBut(block, BUT, B_STOPANIM, ICON_CANCEL, "Anim Player", 0,0,85,UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, "Stop animation playback");
|
||||
}
|
||||
|
||||
|
||||
|
@ -48,21 +48,21 @@ EnumPropertyItem id_type_items[] = {
|
||||
{ID_IM, "IMAGE", ICON_IMAGE_DATA, "Image", ""},
|
||||
{ID_KE, "KEY", ICON_SHAPEKEY_DATA, "Key", ""},
|
||||
{ID_LA, "LAMP", ICON_LAMP_DATA, "Lamp", ""},
|
||||
{ID_LI, "LIBRARY", 0, "Library", ""},
|
||||
{ID_LI, "LIBRARY", ICON_LIBRARY_DATA_DIRECT, "Library", ""},
|
||||
{ID_LT, "LATTICE", ICON_LATTICE_DATA, "Lattice", ""},
|
||||
{ID_MA, "MATERIAL", ICON_MATERIAL_DATA, "Material", ""},
|
||||
{ID_MB, "META", ICON_META_DATA, "MetaBall", ""},
|
||||
{ID_ME, "MESH", ICON_MESH_DATA, "Mesh", ""},
|
||||
{ID_NT, "NODETREE", 0, "NodeTree", ""},
|
||||
{ID_NT, "NODETREE", ICON_NODE, "NodeTree", ""},
|
||||
{ID_OB, "OBJECT", ICON_OBJECT_DATA, "Object", ""},
|
||||
{ID_PA, "PARTICLE", ICON_PARTICLE_DATA, "Particle", ""},
|
||||
{ID_SCE, "SCENE", ICON_SCENE_DATA, "Scene", ""},
|
||||
{ID_SCR, "SCREEN", 0, "Screen", ""},
|
||||
{ID_SO, "SOUND", 0, "Sound", ""},
|
||||
{ID_SCR, "SCREEN", ICON_SPLITSCREEN, "Screen", ""},
|
||||
{ID_SO, "SOUND", ICON_PLAY_AUDIO, "Sound", ""},
|
||||
{ID_TXT, "TEXT", ICON_TEXT, "Text", ""},
|
||||
{ID_TE, "TEXTURE", ICON_TEXTURE_DATA, "Texture", ""},
|
||||
{ID_WO, "WORLD", ICON_WORLD_DATA, "World", ""},
|
||||
{ID_WM, "WINDOWMANAGER", 0, "Window Manager", ""},
|
||||
{ID_WM, "WINDOWMANAGER", ICON_FULLSCREEN, "Window Manager", ""},
|
||||
{0, NULL, 0, NULL, NULL}};
|
||||
|
||||
#ifdef RNA_RUNTIME
|
||||
|
@ -1609,9 +1609,9 @@ static void rna_def_texture(BlenderRNA *brna)
|
||||
|
||||
static EnumPropertyItem prop_type_items[] = {
|
||||
{0, "NONE", 0, "None", ""},
|
||||
{TEX_PLUGIN, "PLUGIN", ICON_CONSTRAINT, "Plugin", ""},
|
||||
{TEX_IMAGE, "IMAGE", ICON_RENDER_RESULT, "Image or Movie", ""},
|
||||
{TEX_ENVMAP, "ENVIRONMENT_MAP", ICON_RENDER_RESULT, "Environment Map", ""},
|
||||
{TEX_PLUGIN, "PLUGIN", ICON_PLUGIN, "Plugin", ""},
|
||||
{TEX_IMAGE, "IMAGE", ICON_IMAGE_DATA, "Image or Movie", ""},
|
||||
{TEX_ENVMAP, "ENVIRONMENT_MAP", ICON_IMAGE_DATA, "Environment Map", ""},
|
||||
{TEX_CLOUDS, "CLOUDS", ICON_TEXTURE, "Clouds", ""},
|
||||
{TEX_WOOD, "WOOD", ICON_TEXTURE, "Wood", ""},
|
||||
{TEX_MARBLE, "MARBLE", ICON_TEXTURE, "Marble", ""},
|
||||
|
Loading…
Reference in New Issue
Block a user