diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_object.py | 14 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_buttons.c | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 65126691d8c..1b49127be76 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -58,7 +58,7 @@ class OBJECT_PT_transform(ObjectButtonsPanel, Panel): row = col.row(align=True) row.prop(ob, "location") row.use_property_decorate = False - row.prop(ob, "lock_location", text="", emboss=False) + row.prop(ob, "lock_location", text="", emboss=False, icon='DECORATE_UNLOCKED') if ob.rotation_mode == 'QUATERNION': col = flow.column() @@ -66,8 +66,8 @@ class OBJECT_PT_transform(ObjectButtonsPanel, Panel): row.prop(ob, "rotation_quaternion", text="Rotation") sub = row.column(align=True) sub.use_property_decorate = False - sub.prop(ob, "lock_rotation_w", text="", emboss=False) - sub.prop(ob, "lock_rotation", text="", emboss=False) + sub.prop(ob, "lock_rotation_w", text="", emboss=False, icon='DECORATE_UNLOCKED') + sub.prop(ob, "lock_rotation", text="", emboss=False, icon='DECORATE_UNLOCKED') elif ob.rotation_mode == 'AXIS_ANGLE': # row.column().label(text="Rotation") #row.column().prop(pchan, "rotation_angle", text="Angle") @@ -78,20 +78,20 @@ class OBJECT_PT_transform(ObjectButtonsPanel, Panel): sub = row.column(align=True) sub.use_property_decorate = False - sub.prop(ob, "lock_rotation_w", text="", emboss=False) - sub.prop(ob, "lock_rotation", text="", emboss=False) + sub.prop(ob, "lock_rotation_w", text="", emboss=False, icon='DECORATE_UNLOCKED') + sub.prop(ob, "lock_rotation", text="", emboss=False, icon='DECORATE_UNLOCKED') else: col = flow.column() row = col.row(align=True) row.prop(ob, "rotation_euler", text="Rotation") row.use_property_decorate = False - row.prop(ob, "lock_rotation", text="", emboss=False) + row.prop(ob, "lock_rotation", text="", emboss=False, icon='DECORATE_UNLOCKED') col = flow.column() row = col.row(align=True) row.prop(ob, "scale") row.use_property_decorate = False - row.prop(ob, "lock_scale", text="", emboss=False) + row.prop(ob, "lock_scale", text="", emboss=False, icon='DECORATE_UNLOCKED') row = layout.row(align=True) row.prop(ob, "rotation_mode") diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 43b7b940b4f..02cf5497040 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -940,7 +940,7 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr) colsub = uiLayoutColumn(split, true); uiLayoutSetEmboss(colsub, UI_EMBOSS_NONE); uiItemL(colsub, "", ICON_NONE); - uiItemR(colsub, ptr, "lock_location", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + uiItemR(colsub, ptr, "lock_location", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_DECORATE_UNLOCKED); split = uiLayoutSplit(layout, 0.8f, false); @@ -952,10 +952,10 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr) uiLayoutSetEmboss(colsub, UI_EMBOSS_NONE); uiItemR(colsub, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE, IFACE_("4L"), ICON_NONE); if (RNA_boolean_get(ptr, "lock_rotations_4d")) - uiItemR(colsub, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE + UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + uiItemR(colsub, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE + UI_ITEM_R_ICON_ONLY, "", ICON_DECORATE_UNLOCKED); else uiItemL(colsub, "", ICON_NONE); - uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_DECORATE_UNLOCKED); break; case ROT_MODE_AXISANGLE: /* axis angle */ colsub = uiLayoutColumn(split, true); @@ -964,10 +964,10 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr) uiLayoutSetEmboss(colsub, UI_EMBOSS_NONE); uiItemR(colsub, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE, IFACE_("4L"), ICON_NONE); if (RNA_boolean_get(ptr, "lock_rotations_4d")) - uiItemR(colsub, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + uiItemR(colsub, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_DECORATE_UNLOCKED); else uiItemL(colsub, "", ICON_NONE); - uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_DECORATE_UNLOCKED); break; default: /* euler rotations */ colsub = uiLayoutColumn(split, true); @@ -975,7 +975,7 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr) colsub = uiLayoutColumn(split, true); uiLayoutSetEmboss(colsub, UI_EMBOSS_NONE); uiItemL(colsub, "", ICON_NONE); - uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_DECORATE_UNLOCKED); break; } uiItemR(layout, ptr, "rotation_mode", 0, "", ICON_NONE); @@ -986,7 +986,7 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr) colsub = uiLayoutColumn(split, true); uiLayoutSetEmboss(colsub, UI_EMBOSS_NONE); uiItemL(colsub, "", ICON_NONE); - uiItemR(colsub, ptr, "lock_scale", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + uiItemR(colsub, ptr, "lock_scale", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_DECORATE_UNLOCKED); if (ptr->type == &RNA_Object) { Object *ob = ptr->data; |