forked from bartvdbraak/blender
* icon set updates, thanks jendryzch
This commit is contained in:
parent
1cc79c1a95
commit
d30be46ad8
Binary file not shown.
Before Width: | Height: | Size: 178 KiB After Width: | Height: | Size: 186 KiB |
@ -29,7 +29,7 @@ class SCENE_PT_render(RenderButtonsPanel):
|
||||
rd = context.scene.render_data
|
||||
|
||||
row = layout.row()
|
||||
row.itemO("screen.render", text="Image", icon='ICON_RENDER_RESULT')
|
||||
row.itemO("screen.render", text="Image", icon='ICON_RENDER_STILL')
|
||||
row.item_booleanO("screen.render", "animation", True, text="Animation", icon='ICON_RENDER_ANIMATION')
|
||||
|
||||
layout.itemR(rd, "display_mode", text="Display")
|
||||
|
@ -183,15 +183,15 @@ class INFO_MT_help(bpy.types.Menu):
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
|
||||
layout.itemO("help.manual")
|
||||
layout.itemO("help.release_logs")
|
||||
layout.itemO("help.manual", icon='ICON_URL')
|
||||
layout.itemO("help.release_logs", icon='ICON_URL')
|
||||
|
||||
layout.itemS()
|
||||
|
||||
layout.itemO("help.blender_website")
|
||||
layout.itemO("help.blender_eshop")
|
||||
layout.itemO("help.developer_community")
|
||||
layout.itemO("help.user_community")
|
||||
layout.itemO("help.blender_website", icon='ICON_URL')
|
||||
layout.itemO("help.blender_eshop", icon='ICON_URL')
|
||||
layout.itemO("help.developer_community", icon='ICON_URL')
|
||||
layout.itemO("help.user_community", icon='ICON_URL')
|
||||
layout.itemS()
|
||||
layout.itemO("help.operator_cheat_sheet")
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -87,7 +87,7 @@ DEF_ICON(ICON_BLANK012b)
|
||||
|
||||
/* various ui */
|
||||
DEF_ICON(ICON_HELP)
|
||||
DEF_ICON(ICON_GHOSTDRAW)
|
||||
DEF_ICON(ICON_GHOST_ENABLED)
|
||||
DEF_ICON(ICON_COLOR)
|
||||
DEF_ICON(ICON_LINKED)
|
||||
DEF_ICON(ICON_UNLINKED)
|
||||
@ -102,11 +102,11 @@ DEF_ICON(ICON_BORDER_RECT)
|
||||
DEF_ICON(ICON_BORDER_LASSO)
|
||||
DEF_ICON(ICON_FREEZE)
|
||||
DEF_ICON(ICON_STYLUS_PRESSURE)
|
||||
DEF_ICON(ICON_BLANK032)
|
||||
DEF_ICON(ICON_BLANK033)
|
||||
DEF_ICON(ICON_BLANK034)
|
||||
DEF_ICON(ICON_BLANK035)
|
||||
DEF_ICON(ICON_BLANK036)
|
||||
DEF_ICON(ICON_GHOST_DISABLED)
|
||||
DEF_ICON(ICON_NEW)
|
||||
DEF_ICON(ICON_FILE_TICK)
|
||||
DEF_ICON(ICON_CANCEL)
|
||||
DEF_ICON(ICON_URL)
|
||||
DEF_ICON(ICON_BLANK037)
|
||||
DEF_ICON(ICON_BLANK038)
|
||||
DEF_ICON(ICON_BLANK039)
|
||||
@ -236,7 +236,7 @@ DEF_ICON(ICON_SURFACE_DATA)
|
||||
DEF_ICON(ICON_EMPTY_DATA)
|
||||
DEF_ICON(ICON_SETTINGS)
|
||||
DEF_ICON(ICON_RENDER_ANIMATION)
|
||||
DEF_ICON(ICON_BLANK080E)
|
||||
DEF_ICON(ICON_RENDER_STILL)
|
||||
DEF_ICON(ICON_BLANK080F)
|
||||
DEF_ICON(ICON_BOIDS)
|
||||
DEF_ICON(ICON_STRANDS)
|
||||
@ -665,9 +665,9 @@ DEF_ICON(ICON_STICKY_UVS_VERT)
|
||||
DEF_ICON(ICON_CLIPUV_DEHLT)
|
||||
DEF_ICON(ICON_CLIPUV_HLT)
|
||||
DEF_ICON(ICON_SNAP_PEEL_OBJECT)
|
||||
DEF_ICON(ICON_BLANK221)
|
||||
DEF_ICON(ICON_GRID)
|
||||
DEF_ICON(ICON_GEARS)
|
||||
DEF_ICON(ICON_BLANK221)
|
||||
DEF_ICON(ICON_BLANK224)
|
||||
DEF_ICON(ICON_BLANK225)
|
||||
DEF_ICON(ICON_BLANK226)
|
||||
|
@ -325,9 +325,9 @@ void graph_header_buttons(const bContext *C, ARegion *ar)
|
||||
/* ghost curves */
|
||||
// XXX these icons need to be changed
|
||||
if (sipo->ghostCurves.first)
|
||||
uiDefIconButO(block, BUT, "GRAPH_OT_ghost_curves_clear", WM_OP_INVOKE_REGION_WIN, ICON_OUTLINER_DATA_CURVE, xco,yco,XIC,YIC, "Clear F-Curve snapshots (Ghosts) for this Graph Editor instance");
|
||||
uiDefIconButO(block, BUT, "GRAPH_OT_ghost_curves_clear", WM_OP_INVOKE_REGION_WIN, ICON_GHOST_DISABLED, xco,yco,XIC,YIC, "Clear F-Curve snapshots (Ghosts) for this Graph Editor instance");
|
||||
else
|
||||
uiDefIconButO(block, BUT, "GRAPH_OT_ghost_curves_create", WM_OP_INVOKE_REGION_WIN, ICON_OUTLINER_OB_CURVE, xco,yco,XIC,YIC, "Create snapshot (Ghosts) of selected F-Curves as background aid for this Graph Editor instance");
|
||||
uiDefIconButO(block, BUT, "GRAPH_OT_ghost_curves_create", WM_OP_INVOKE_REGION_WIN, ICON_GHOST_ENABLED, xco,yco,XIC,YIC, "Create snapshot (Ghosts) of selected F-Curves as background aid for this Graph Editor instance");
|
||||
xco+= XIC;
|
||||
|
||||
|
||||
|
@ -1225,50 +1225,50 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
|
||||
|
||||
static EnumPropertyItem image_type_items[] = {
|
||||
{0, "", 0, "Image", NULL},
|
||||
{R_PNG, "PNG", 0, "PNG", ""},
|
||||
{R_JPEG90, "JPEG", 0, "JPEG", ""},
|
||||
{R_PNG, "PNG", ICON_FILE_IMAGE, "PNG", ""},
|
||||
{R_JPEG90, "JPEG", ICON_FILE_IMAGE, "JPEG", ""},
|
||||
#ifdef WITH_OPENJPEG
|
||||
{R_JP2, "JPEG2000", 0, "JPEG 2000", ""},
|
||||
{R_JP2, "JPEG2000", ICON_FILE_IMAGE, "JPEG 2000", ""},
|
||||
#endif
|
||||
{R_BMP, "BMP", 0, "BMP", ""},
|
||||
{R_TARGA, "TARGA", 0, "Targa", ""},
|
||||
{R_RAWTGA, "RAWTARGA", 0, "Targa Raw", ""},
|
||||
//{R_DDS, "DDS", 0, "DDS", ""}, // XXX not yet implemented
|
||||
{R_HAMX, "HAMX", 0, "HamX", ""},
|
||||
{R_IRIS, "IRIS", 0, "Iris", ""},
|
||||
{R_BMP, "BMP", ICON_FILE_IMAGE, "BMP", ""},
|
||||
{R_TARGA, "TARGA", ICON_FILE_IMAGE, "Targa", ""},
|
||||
{R_RAWTGA, "RAWTARGA", ICON_FILE_IMAGE, "Targa Raw", ""},
|
||||
//{R_DDS, "DDS", ICON_FILE_IMAGE, "DDS", ""}, // XXX not yet implemented
|
||||
{R_HAMX, "HAMX", ICON_FILE_IMAGE, "HamX", ""},
|
||||
{R_IRIS, "IRIS", ICON_FILE_IMAGE, "Iris", ""},
|
||||
{0, "", 0, " ", NULL},
|
||||
#ifdef WITH_OPENEXR
|
||||
{R_OPENEXR, "OPENEXR", 0, "OpenEXR", ""},
|
||||
{R_MULTILAYER, "MULTILAYER", 0, "MultiLayer", ""},
|
||||
{R_OPENEXR, "OPENEXR", ICON_FILE_IMAGE, "OpenEXR", ""},
|
||||
{R_MULTILAYER, "MULTILAYER", ICON_FILE_IMAGE, "MultiLayer", ""},
|
||||
#endif
|
||||
{R_TIFF, "TIFF", 0, "TIFF", ""}, // XXX only with G.have_libtiff
|
||||
{R_RADHDR, "RADHDR", 0, "Radiance HDR", ""},
|
||||
{R_CINEON, "CINEON", 0, "Cineon", ""},
|
||||
{R_DPX, "DPX", 0, "DPX", ""},
|
||||
{R_TIFF, "TIFF", ICON_FILE_IMAGE, "TIFF", ""}, // XXX only with G.have_libtiff
|
||||
{R_RADHDR, "RADHDR", ICON_FILE_IMAGE, "Radiance HDR", ""},
|
||||
{R_CINEON, "CINEON", ICON_FILE_IMAGE, "Cineon", ""},
|
||||
{R_DPX, "DPX", ICON_FILE_IMAGE, "DPX", ""},
|
||||
{0, "", 0, "Movie", NULL},
|
||||
{R_AVIRAW, "AVIRAW", 0, "AVI Raw", ""},
|
||||
{R_AVIJPEG, "AVIJPEG", 0, "AVI JPEG", ""},
|
||||
{R_AVIRAW, "AVIRAW", ICON_FILE_MOVIE, "AVI Raw", ""},
|
||||
{R_AVIJPEG, "AVIJPEG", ICON_FILE_MOVIE, "AVI JPEG", ""},
|
||||
#ifdef _WIN32
|
||||
{R_AVICODEC, "AVICODEC", 0, "AVI Codec", ""},
|
||||
{R_AVICODEC, "AVICODEC", ICON_FILE_MOVIE, "AVI Codec", ""},
|
||||
#endif
|
||||
#ifdef WITH_QUICKTIME
|
||||
{R_QUICKTIME, "QUICKTIME", 0, "QuickTime", ""},
|
||||
{R_QUICKTIME, "QUICKTIME", ICON_FILE_MOVIE, "QuickTime", ""},
|
||||
#endif
|
||||
#ifdef __sgi
|
||||
{R_MOVIE, "MOVIE", 0, "Movie", ""},
|
||||
{R_MOVIE, "MOVIE", ICON_FILE_MOVIE, "Movie", ""},
|
||||
#endif
|
||||
#ifdef WITH_FFMPEG
|
||||
{R_H264, "H264", 0, "H.264", ""},
|
||||
{R_XVID, "XVID", 0, "Xvid", ""},
|
||||
{R_H264, "H264", ICON_FILE_MOVIE, "H.264", ""},
|
||||
{R_XVID, "XVID", ICON_FILE_MOVIE, "Xvid", ""},
|
||||
// XXX broken
|
||||
#if 0
|
||||
#ifdef WITH_OGG
|
||||
{R_THEORA, "THEORA", 0, "Ogg Theora", ""},
|
||||
{R_THEORA, "THEORA", ICON_FILE_MOVIE, "Ogg Theora", ""},
|
||||
#endif
|
||||
#endif
|
||||
{R_FFMPEG, "FFMPEG", 0, "FFMpeg", ""},
|
||||
{R_FFMPEG, "FFMPEG", ICON_FILE_MOVIE, "FFMpeg", ""},
|
||||
#endif
|
||||
{R_FRAMESERVER, "FRAMESERVER", 0, "Frame Server", ""},
|
||||
{R_FRAMESERVER, "FRAMESERVER", ICON_FILE_SCRIPT, "Frame Server", ""},
|
||||
{0, NULL, 0, NULL, NULL}};
|
||||
|
||||
#ifdef WITH_OPENEXR
|
||||
|
Loading…
Reference in New Issue
Block a user