forked from bartvdbraak/blender
* Icon updates and fixes
* Made the buttons space listen to and update for new active objects * Cleaned up the Add Object menu
This commit is contained in:
parent
2e93dc4037
commit
387df32933
Binary file not shown.
Before Width: | Height: | Size: 140 KiB After Width: | Height: | Size: 140 KiB |
File diff suppressed because it is too large
Load Diff
@ -213,7 +213,7 @@ typedef enum {
|
||||
ICON_OBJECT_DATA,
|
||||
ICON_MESH_DATA,
|
||||
ICON_CURVE_DATA,
|
||||
ICON_MBALL_DATA,
|
||||
ICON_META_DATA,
|
||||
ICON_LATTICE_DATA,
|
||||
ICON_LAMP_DATA,
|
||||
ICON_MATERIAL_DATA,
|
||||
@ -239,11 +239,11 @@ typedef enum {
|
||||
ICON_IMAGE_DATA,
|
||||
ICON_FILE,
|
||||
ICON_FCURVE,
|
||||
ICON_FONT,
|
||||
ICON_FONT_DATA,
|
||||
ICON_RENDER_RESULT,
|
||||
ICON_BLANK080A,
|
||||
ICON_BLANK080B,
|
||||
ICON_BLANK080C,
|
||||
ICON_SURFACE_DATA,
|
||||
ICON_EMPTY_DATA,
|
||||
ICON_SETTINGS,
|
||||
ICON_BLANK080D,
|
||||
ICON_BLANK080E,
|
||||
ICON_BLANK080F,
|
||||
@ -319,7 +319,7 @@ typedef enum {
|
||||
ICON_BLANK127b,
|
||||
|
||||
/* OUTLINER */
|
||||
ICON_BLANK128,
|
||||
ICON_OUTLINER_DATA_EMPTY,
|
||||
ICON_OUTLINER_DATA_MESH,
|
||||
ICON_OUTLINER_DATA_CURVE,
|
||||
ICON_OUTLINER_DATA_LATTICE,
|
||||
@ -355,7 +355,7 @@ typedef enum {
|
||||
ICON_MOD_SOFT,
|
||||
ICON_MOD_SUBSURF,
|
||||
ICON_HOOK,
|
||||
ICON_MOD_PARTICLEINSTANCE,
|
||||
ICON_MOD_PHYSICS,
|
||||
ICON_MOD_PARTICLES,
|
||||
ICON_MOD_BOOLEAN,
|
||||
ICON_MOD_EDGESPLIT,
|
||||
|
@ -90,7 +90,7 @@ int UI_GetIconRNA(PointerRNA *ptr)
|
||||
else if(rnatype == &RNA_Curve)
|
||||
return ICON_CURVE_DATA;
|
||||
else if(rnatype == &RNA_MetaBall)
|
||||
return ICON_MBALL_DATA;
|
||||
return ICON_META_DATA;
|
||||
else if(rnatype == &RNA_MetaElement)
|
||||
return ICON_OUTLINER_DATA_META;
|
||||
else if(rnatype == &RNA_Lattice)
|
||||
@ -142,7 +142,7 @@ int UI_GetIconRNA(PointerRNA *ptr)
|
||||
else if(rnatype == &RNA_Brush)
|
||||
return ICON_BRUSH_DATA;
|
||||
else if(rnatype == &RNA_VectorFont)
|
||||
return ICON_FONT;
|
||||
return ICON_FONT_DATA;
|
||||
else if(rnatype == &RNA_Library)
|
||||
return ICON_LIBRARY_DATA_DIRECT;
|
||||
else if(rnatype == &RNA_Action)
|
||||
@ -204,7 +204,7 @@ int UI_GetIconRNA(PointerRNA *ptr)
|
||||
else if(rnatype == &RNA_BooleanModifier)
|
||||
return ICON_MOD_BOOLEAN;
|
||||
else if(rnatype == &RNA_ParticleInstanceModifier)
|
||||
return ICON_MOD_PARTICLEINSTANCE;
|
||||
return ICON_MOD_PARTICLES;
|
||||
else if(rnatype == &RNA_ParticleSystemModifier)
|
||||
return ICON_MOD_PARTICLES;
|
||||
else if(rnatype == &RNA_EdgeSplitModifier)
|
||||
@ -233,6 +233,8 @@ int UI_GetIconRNA(PointerRNA *ptr)
|
||||
return ICON_MOD_CLOTH;
|
||||
else if(rnatype == &RNA_ExplodeModifier)
|
||||
return ICON_MOD_EXPLODE;
|
||||
else if(rnatype == &RNA_CollisionModifier)
|
||||
return ICON_MOD_PHYSICS;
|
||||
else
|
||||
return ICON_DOT;
|
||||
}
|
||||
|
@ -405,7 +405,7 @@ static int object_add_mesh_exec(bContext *C, wmOperator *op)
|
||||
void OBJECT_OT_mesh_add(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Add Mesh";
|
||||
ot->name= "Mesh";
|
||||
ot->description = "Add a mesh object to the scene.";
|
||||
ot->idname= "OBJECT_OT_mesh_add";
|
||||
|
||||
@ -479,7 +479,7 @@ static int object_add_curve_invoke(bContext *C, wmOperator *op, wmEvent *event)
|
||||
void OBJECT_OT_curve_add(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Add Curve";
|
||||
ot->name= "Curve";
|
||||
ot->description = "Add a curve object to the scene.";
|
||||
ot->idname= "OBJECT_OT_curve_add";
|
||||
|
||||
@ -537,7 +537,7 @@ static int object_add_surface_exec(bContext *C, wmOperator *op)
|
||||
void OBJECT_OT_surface_add(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Add Surface";
|
||||
ot->name= "Surface";
|
||||
ot->description = "Add a surface object to the scene.";
|
||||
ot->idname= "OBJECT_OT_surface_add";
|
||||
|
||||
@ -574,7 +574,7 @@ static int object_add_text_exec(bContext *C, wmOperator *op)
|
||||
void OBJECT_OT_text_add(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Add Text";
|
||||
ot->name= "Text";
|
||||
ot->description = "Add a text object to the scene";
|
||||
ot->idname= "OBJECT_OT_text_add";
|
||||
|
||||
@ -619,7 +619,7 @@ static int object_armature_add_exec(bContext *C, wmOperator *op)
|
||||
void OBJECT_OT_armature_add(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name= "Add Armature";
|
||||
ot->name= "Armature";
|
||||
ot->description = "Add an armature object to the scene.";
|
||||
ot->idname= "OBJECT_OT_armature_add";
|
||||
|
||||
@ -637,7 +637,7 @@ static int object_primitive_add_invoke(bContext *C, wmOperator *op, wmEvent *eve
|
||||
uiPopupMenu *pup= uiPupMenuBegin("Add Object", 0);
|
||||
uiLayout *layout= uiPupMenuLayout(pup);
|
||||
|
||||
uiItemMenuEnumO(layout, NULL, /*ICON_OUTLINER_OB_MESH*/0, "OBJECT_OT_mesh_add", "type");
|
||||
uiItemMenuEnumO(layout, NULL, ICON_OUTLINER_OB_MESH, "OBJECT_OT_mesh_add", "type");
|
||||
uiItemMenuEnumO(layout, NULL, ICON_OUTLINER_OB_CURVE, "OBJECT_OT_curve_add", "type");
|
||||
uiItemMenuEnumO(layout, NULL, ICON_OUTLINER_OB_SURFACE, "OBJECT_OT_surface_add", "type");
|
||||
uiItemO(layout, NULL, ICON_OUTLINER_OB_FONT, "OBJECT_OT_text_add");
|
||||
|
@ -156,16 +156,16 @@ void buttons_header_buttons(const bContext *C, ARegion *ar)
|
||||
|
||||
if(ob) {
|
||||
switch(ob->type) {
|
||||
case OB_EMPTY: dataicon= ICON_OUTLINER_OB_EMPTY; break;
|
||||
case OB_MESH: dataicon= ICON_OUTLINER_OB_MESH; break;
|
||||
case OB_CURVE: dataicon= ICON_OUTLINER_OB_CURVE; break;
|
||||
case OB_SURF: dataicon= ICON_OUTLINER_OB_SURFACE; break;
|
||||
case OB_FONT: dataicon= ICON_OUTLINER_OB_FONT; break;
|
||||
case OB_MBALL: dataicon= ICON_OUTLINER_OB_META; break;
|
||||
case OB_LAMP: dataicon= ICON_OUTLINER_OB_LAMP; break;
|
||||
case OB_CAMERA: dataicon= ICON_OUTLINER_OB_CAMERA; break;
|
||||
case OB_LATTICE: dataicon= ICON_OUTLINER_OB_LATTICE; break;
|
||||
case OB_ARMATURE: dataicon= ICON_OUTLINER_OB_ARMATURE; break;
|
||||
case OB_EMPTY: dataicon= ICON_EMPTY_DATA; break;
|
||||
case OB_MESH: dataicon= ICON_MESH_DATA; break;
|
||||
case OB_CURVE: dataicon= ICON_CURVE_DATA; break;
|
||||
case OB_SURF: dataicon= ICON_SURFACE_DATA; break;
|
||||
case OB_FONT: dataicon= ICON_FONT_DATA; break;
|
||||
case OB_MBALL: dataicon= ICON_META_DATA; break;
|
||||
case OB_LAMP: dataicon= ICON_LAMP_DATA; break;
|
||||
case OB_CAMERA: dataicon= ICON_CAMERA_DATA; break;
|
||||
case OB_LATTICE: dataicon= ICON_LATTICE_DATA; break;
|
||||
case OB_ARMATURE: dataicon= ICON_ARMATURE_DATA; break;
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
|
@ -237,6 +237,7 @@ static void buttons_area_listener(ARegion *ar, wmNotifier *wmn)
|
||||
case NC_SCENE:
|
||||
switch(wmn->data) {
|
||||
case ND_FRAME:
|
||||
case ND_OB_ACTIVE:
|
||||
ED_region_tag_redraw(ar);
|
||||
break;
|
||||
}
|
||||
|
@ -3564,7 +3564,7 @@ static void tselem_draw_icon(float x, float y, TreeStoreElem *tselem, TreeElemen
|
||||
case eModifierType_Boolean:
|
||||
UI_icon_draw(x, y, ICON_MOD_BOOLEAN); break;
|
||||
case eModifierType_ParticleSystem:
|
||||
UI_icon_draw(x, y, ICON_MOD_PARTICLEINSTANCE); break;
|
||||
UI_icon_draw(x, y, ICON_MOD_PARTICLES); break;
|
||||
case eModifierType_ParticleInstance:
|
||||
UI_icon_draw(x, y, ICON_MOD_PARTICLES); break;
|
||||
case eModifierType_EdgeSplit:
|
||||
@ -3593,6 +3593,8 @@ static void tselem_draw_icon(float x, float y, TreeStoreElem *tselem, TreeElemen
|
||||
UI_icon_draw(x, y, ICON_MOD_CLOTH); break;
|
||||
case eModifierType_Explode:
|
||||
UI_icon_draw(x, y, ICON_MOD_EXPLODE); break;
|
||||
case eModifierType_Collision:
|
||||
UI_icon_draw(x, y, ICON_MOD_PHYSICS); break;
|
||||
default:
|
||||
UI_icon_draw(x, y, ICON_DOT); break;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user