forked from bartvdbraak/blender
* Another handful of brilliant new icons by jendryzch
This commit is contained in:
parent
4cc908b676
commit
10c18d72f4
Binary file not shown.
Before Width: | Height: | Size: 175 KiB After Width: | Height: | Size: 178 KiB |
File diff suppressed because it is too large
Load Diff
@ -101,7 +101,7 @@ DEF_ICON(ICON_RENDER_REGION)
|
|||||||
DEF_ICON(ICON_BORDER_RECT)
|
DEF_ICON(ICON_BORDER_RECT)
|
||||||
DEF_ICON(ICON_BORDER_LASSO)
|
DEF_ICON(ICON_BORDER_LASSO)
|
||||||
DEF_ICON(ICON_FREEZE)
|
DEF_ICON(ICON_FREEZE)
|
||||||
DEF_ICON(ICON_BLANK031)
|
DEF_ICON(ICON_STYLUS_PRESSURE)
|
||||||
DEF_ICON(ICON_BLANK032)
|
DEF_ICON(ICON_BLANK032)
|
||||||
DEF_ICON(ICON_BLANK033)
|
DEF_ICON(ICON_BLANK033)
|
||||||
DEF_ICON(ICON_BLANK034)
|
DEF_ICON(ICON_BLANK034)
|
||||||
@ -241,7 +241,7 @@ DEF_ICON(ICON_BLANK080F)
|
|||||||
DEF_ICON(ICON_BOIDS)
|
DEF_ICON(ICON_BOIDS)
|
||||||
DEF_ICON(ICON_STRANDS)
|
DEF_ICON(ICON_STRANDS)
|
||||||
DEF_ICON(ICON_LIBRARY_DATA_INDIRECT)
|
DEF_ICON(ICON_LIBRARY_DATA_INDIRECT)
|
||||||
DEF_ICON(ICON_BLANK082)
|
DEF_ICON(ICON_GREASEPENCIL)
|
||||||
DEF_ICON(ICON_BLANK083)
|
DEF_ICON(ICON_BLANK083)
|
||||||
DEF_ICON(ICON_BLANK084)
|
DEF_ICON(ICON_BLANK084)
|
||||||
DEF_ICON(ICON_GROUP_BONE)
|
DEF_ICON(ICON_GROUP_BONE)
|
||||||
@ -538,7 +538,7 @@ DEF_ICON(ICON_MOD_CLOTH)
|
|||||||
DEF_ICON(ICON_MOD_EXPLODE)
|
DEF_ICON(ICON_MOD_EXPLODE)
|
||||||
DEF_ICON(ICON_MOD_FLUIDSIM)
|
DEF_ICON(ICON_MOD_FLUIDSIM)
|
||||||
DEF_ICON(ICON_MOD_MULTIRES)
|
DEF_ICON(ICON_MOD_MULTIRES)
|
||||||
DEF_ICON(ICON_BLANK157)
|
DEF_ICON(ICON_MOD_SMOKE)
|
||||||
DEF_ICON(ICON_BLANK158)
|
DEF_ICON(ICON_BLANK158)
|
||||||
DEF_ICON(ICON_BLANK159)
|
DEF_ICON(ICON_BLANK159)
|
||||||
DEF_ICON(ICON_BLANK160)
|
DEF_ICON(ICON_BLANK160)
|
||||||
@ -686,10 +686,10 @@ DEF_ICON(ICON_BLANK231)
|
|||||||
DEF_ICON(ICON_BLANK232)
|
DEF_ICON(ICON_BLANK232)
|
||||||
DEF_ICON(ICON_BLANK233)
|
DEF_ICON(ICON_BLANK233)
|
||||||
DEF_ICON(ICON_BLANK234)
|
DEF_ICON(ICON_BLANK234)
|
||||||
DEF_ICON(ICON_BLANK235)
|
DEF_ICON(ICON_UV_VERTEXSEL)
|
||||||
DEF_ICON(ICON_BLANK236)
|
DEF_ICON(ICON_UV_EDGESEL)
|
||||||
DEF_ICON(ICON_BLANK237)
|
DEF_ICON(ICON_UV_FACESEL)
|
||||||
DEF_ICON(ICON_BLANK238)
|
DEF_ICON(ICON_UV_ISLANDSEL)
|
||||||
DEF_ICON(ICON_BLANK239)
|
DEF_ICON(ICON_BLANK239)
|
||||||
DEF_ICON(ICON_BLANK240)
|
DEF_ICON(ICON_BLANK240)
|
||||||
DEF_ICON(ICON_BLANK241)
|
DEF_ICON(ICON_BLANK241)
|
||||||
|
@ -521,13 +521,13 @@ void brush_buttons(const bContext *C, uiBlock *block, short fromsima,
|
|||||||
uiBlockBeginAlign(block);
|
uiBlockBeginAlign(block);
|
||||||
uiDefButF(block, COL, B_VPCOLSLI, "", 0,yco,200,19, brush->rgb, 0, 0, 0, 0, "");
|
uiDefButF(block, COL, B_VPCOLSLI, "", 0,yco,200,19, brush->rgb, 0, 0, 0, 0, "");
|
||||||
uiDefButF(block, NUMSLI, evt_nop, "Opacity ", 0,yco-20,180,19, &brush->alpha, 0.0, 1.0, 0, 0, "The amount of pressure on the brush");
|
uiDefButF(block, NUMSLI, evt_nop, "Opacity ", 0,yco-20,180,19, &brush->alpha, 0.0, 1.0, 0, 0, "The amount of pressure on the brush");
|
||||||
uiDefButBitS(block, TOG|BIT, BRUSH_ALPHA_PRESSURE, evt_nop, "P", 180,yco-20,20,19, &brush->flag, 0, 0, 0, 0, "Enables pressure sensitivity for tablets");
|
uiDefIconButBitS(block, TOG|BIT, BRUSH_ALPHA_PRESSURE, evt_nop, ICON_STYLUS_PRESSURE, 180,yco-20,20,19, &brush->flag, 0, 0, 0, 0, "Enables pressure sensitivity for tablets");
|
||||||
uiDefButI(block, NUMSLI, evt_nop, "Size ", 0,yco-40,180,19, &brush->size, 1, 200, 0, 0, "The size of the brush");
|
uiDefButI(block, NUMSLI, evt_nop, "Size ", 0,yco-40,180,19, &brush->size, 1, 200, 0, 0, "The size of the brush");
|
||||||
uiDefButBitS(block, TOG|BIT, BRUSH_SIZE_PRESSURE, evt_nop, "P", 180,yco-40,20,19, &brush->flag, 0, 0, 0, 0, "Enables pressure sensitivity for tablets");
|
uiDefIconButBitS(block, TOG|BIT, BRUSH_SIZE_PRESSURE, evt_nop, ICON_STYLUS_PRESSURE, 180,yco-40,20,19, &brush->flag, 0, 0, 0, 0, "Enables pressure sensitivity for tablets");
|
||||||
uiDefButF(block, NUMSLI, evt_nop, "Falloff ", 0,yco-60,180,19, &brush->innerradius, 0.0, 1.0, 0, 0, "The fall off radius of the brush");
|
uiDefButF(block, NUMSLI, evt_nop, "Falloff ", 0,yco-60,180,19, &brush->innerradius, 0.0, 1.0, 0, 0, "The fall off radius of the brush");
|
||||||
uiDefButBitS(block, TOG|BIT, BRUSH_RAD_PRESSURE, evt_nop, "P", 180,yco-60,20,19, &brush->flag, 0, 0, 0, 0, "Enables pressure sensitivity for tablets");
|
uiDefIconButBitS(block, TOG|BIT, BRUSH_RAD_PRESSURE, evt_nop, ICON_STYLUS_PRESSURE, 180,yco-60,20,19, &brush->flag, 0, 0, 0, 0, "Enables pressure sensitivity for tablets");
|
||||||
uiDefButF(block, NUMSLI, evt_nop, "Spacing ",0,yco-80,180,19, &brush->spacing, 1.0, 100.0, 0, 0, "Repeating paint on %% of brush diameter");
|
uiDefButF(block, NUMSLI, evt_nop, "Spacing ",0,yco-80,180,19, &brush->spacing, 1.0, 100.0, 0, 0, "Repeating paint on %% of brush diameter");
|
||||||
uiDefButBitS(block, TOG|BIT, BRUSH_SPACING_PRESSURE, evt_nop, "P", 180,yco-80,20,19, &brush->flag, 0, 0, 0, 0, "Enables pressure sensitivity for tablets");
|
uiDefIconButBitS(block, TOG|BIT, BRUSH_SPACING_PRESSURE, evt_nop, ICON_STYLUS_PRESSURE, 180,yco-80,20,19, &brush->flag, 0, 0, 0, 0, "Enables pressure sensitivity for tablets");
|
||||||
uiBlockEndAlign(block);
|
uiBlockEndAlign(block);
|
||||||
|
|
||||||
yco -= 110;
|
yco -= 110;
|
||||||
|
@ -166,18 +166,22 @@ void rna_def_brush(BlenderRNA *brna)
|
|||||||
|
|
||||||
prop= RNA_def_property(srna, "strength_pressure", PROP_BOOLEAN, PROP_NONE);
|
prop= RNA_def_property(srna, "strength_pressure", PROP_BOOLEAN, PROP_NONE);
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_ALPHA_PRESSURE);
|
RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_ALPHA_PRESSURE);
|
||||||
|
RNA_def_property_ui_icon(prop, ICON_STYLUS_PRESSURE, 0);
|
||||||
RNA_def_property_ui_text(prop, "Strength Pressure", "Enable tablet pressure sensitivity for strength.");
|
RNA_def_property_ui_text(prop, "Strength Pressure", "Enable tablet pressure sensitivity for strength.");
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "size_pressure", PROP_BOOLEAN, PROP_NONE);
|
prop= RNA_def_property(srna, "size_pressure", PROP_BOOLEAN, PROP_NONE);
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_SIZE_PRESSURE);
|
RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_SIZE_PRESSURE);
|
||||||
|
RNA_def_property_ui_icon(prop, ICON_STYLUS_PRESSURE, 0);
|
||||||
RNA_def_property_ui_text(prop, "Size Pressure", "Enable tablet pressure sensitivity for size.");
|
RNA_def_property_ui_text(prop, "Size Pressure", "Enable tablet pressure sensitivity for size.");
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "falloff_pressure", PROP_BOOLEAN, PROP_NONE);
|
prop= RNA_def_property(srna, "falloff_pressure", PROP_BOOLEAN, PROP_NONE);
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_RAD_PRESSURE);
|
RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_RAD_PRESSURE);
|
||||||
|
RNA_def_property_ui_icon(prop, ICON_STYLUS_PRESSURE, 0);
|
||||||
RNA_def_property_ui_text(prop, "Falloff Pressure", "Enable tablet pressure sensitivity for falloff.");
|
RNA_def_property_ui_text(prop, "Falloff Pressure", "Enable tablet pressure sensitivity for falloff.");
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "spacing_pressure", PROP_BOOLEAN, PROP_NONE);
|
prop= RNA_def_property(srna, "spacing_pressure", PROP_BOOLEAN, PROP_NONE);
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_SPACING_PRESSURE);
|
RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_SPACING_PRESSURE);
|
||||||
|
RNA_def_property_ui_icon(prop, ICON_STYLUS_PRESSURE, 0);
|
||||||
RNA_def_property_ui_text(prop, "Spacing Pressure", "Enable tablet pressure sensitivity for spacing.");
|
RNA_def_property_ui_text(prop, "Spacing Pressure", "Enable tablet pressure sensitivity for spacing.");
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "rake", PROP_BOOLEAN, PROP_NONE);
|
prop= RNA_def_property(srna, "rake", PROP_BOOLEAN, PROP_NONE);
|
||||||
|
@ -223,7 +223,7 @@ void rna_def_gpencil_data(BlenderRNA *brna)
|
|||||||
srna= RNA_def_struct(brna, "GreasePencil", "ID");
|
srna= RNA_def_struct(brna, "GreasePencil", "ID");
|
||||||
RNA_def_struct_sdna(srna, "bGPdata");
|
RNA_def_struct_sdna(srna, "bGPdata");
|
||||||
RNA_def_struct_ui_text(srna, "Grease Pencil", "Freehand annotation sketchbook.");
|
RNA_def_struct_ui_text(srna, "Grease Pencil", "Freehand annotation sketchbook.");
|
||||||
RNA_def_struct_ui_icon(srna, ICON_BRUSH_DATA); // XXX: ICON_GPENCIL!!!
|
RNA_def_struct_ui_icon(srna, ICON_GREASEPENCIL);
|
||||||
|
|
||||||
/* Layers */
|
/* Layers */
|
||||||
prop= RNA_def_property(srna, "layers", PROP_COLLECTION, PROP_NONE);
|
prop= RNA_def_property(srna, "layers", PROP_COLLECTION, PROP_NONE);
|
||||||
|
@ -75,7 +75,7 @@ EnumPropertyItem modifier_type_items[] ={
|
|||||||
{eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MOD_FLUIDSIM, "Fluid Simulation", ""},
|
{eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MOD_FLUIDSIM, "Fluid Simulation", ""},
|
||||||
{eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES, "Particle Instance", ""},
|
{eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES, "Particle Instance", ""},
|
||||||
{eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "Particle System", ""},
|
{eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "Particle System", ""},
|
||||||
{eModifierType_Smoke, "SMOKE", 0, "Smoke", ""},
|
{eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""},
|
||||||
{eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""},
|
{eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""},
|
||||||
{eModifierType_Surface, "SURFACE", ICON_MOD_PHYSICS, "Surface", ""},
|
{eModifierType_Surface, "SURFACE", ICON_MOD_PHYSICS, "Surface", ""},
|
||||||
{0, NULL, 0, NULL, NULL}};
|
{0, NULL, 0, NULL, NULL}};
|
||||||
|
@ -394,10 +394,10 @@ static void rna_def_tool_settings(BlenderRNA *brna)
|
|||||||
PropertyRNA *prop;
|
PropertyRNA *prop;
|
||||||
|
|
||||||
static EnumPropertyItem uv_select_mode_items[] = {
|
static EnumPropertyItem uv_select_mode_items[] = {
|
||||||
{UV_SELECT_VERTEX, "VERTEX", ICON_VERTEXSEL, "Vertex", "Vertex selection mode."},
|
{UV_SELECT_VERTEX, "VERTEX", ICON_UV_VERTEXSEL, "Vertex", "Vertex selection mode."},
|
||||||
{UV_SELECT_EDGE, "EDGE", ICON_EDGESEL, "Edge", "Edge selection mode."},
|
{UV_SELECT_EDGE, "EDGE", ICON_UV_EDGESEL, "Edge", "Edge selection mode."},
|
||||||
{UV_SELECT_FACE, "FACE", ICON_FACESEL, "Face", "Face selection mode."},
|
{UV_SELECT_FACE, "FACE", ICON_UV_FACESEL, "Face", "Face selection mode."},
|
||||||
{UV_SELECT_ISLAND, "ISLAND", ICON_LINKEDSEL, "Island", "Island selection mode."},
|
{UV_SELECT_ISLAND, "ISLAND", ICON_UV_ISLANDSEL, "Island", "Island selection mode."},
|
||||||
{0, NULL, 0, NULL, NULL}};
|
{0, NULL, 0, NULL, NULL}};
|
||||||
|
|
||||||
static EnumPropertyItem mesh_select_mode_items[] = {
|
static EnumPropertyItem mesh_select_mode_items[] = {
|
||||||
|
Loading…
Reference in New Issue
Block a user