griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: Corrections for Object Scale Warnings

Browse Source 
Small changes to the status bar display when the active object has non-
uniform or negative scale. Use CTX_data_active_object rather than
BKE_view_layer_active_object_get. Case correction for a text string.
Small spacing change. Improved comments.

Pull Request: https://projects.blender.org/blender/blender/pulls/133834
This commit is contained in:
Harley Acheson
2025-01-30 20:10:22 +01:00
committed by Harley Acheson
parent c2fd4eb9cc
commit 224dffc41b
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/editors/interface/templates/interface_template_status.cc
View File

@@ -218,27 +218,31 @@ static bool uiTemplateInputStatusHeader(ARegion *region, uiLayout *row)
static bool uiTemplateInputStatus3DView(bContext *C, uiLayout *row)
{
const ViewLayer *view_layer = CTX_data_view_layer(C);
const Object *ob = BKE_view_layer_active_object_get(view_layer);
if (ob && is_negative_m4(ob->object_to_world().ptr())) {
const Object *ob = CTX_data_active_object(C);
if (!ob) {
return false;
}
if (is_negative_m4(ob->object_to_world().ptr())) {
uiItemS_ex(row, 1.0f);
uiItemL(row, "", ICON_ERROR);
uiItemS_ex(row, -0.2f);
uiItemL(row, IFACE_("Active object has negative scale"), ICON_NONE);
uiItemS_ex(row, 1.0f, LayoutSeparatorType::Line);
uiItemS_ex(row, 0.5f);
uiItemS_ex(row, 0.5f, LayoutSeparatorType::Line);
uiItemS_ex(row, 0.8f);
/* Return false to allow other items to be added after. */
return false;
}
if (ob &&
!(fabsf(ob->scale[0] - ob->scale[1]) < 1e-4f && fabsf(ob->scale[1] - ob->scale[2]) < 1e-4f))
if (!(fabsf(ob->scale[0] - ob->scale[1]) < 1e-4f && fabsf(ob->scale[1] - ob->scale[2]) < 1e-4f))
{
uiItemS_ex(row, 1.0f);
uiItemL(row, "", ICON_ERROR);
uiItemS_ex(row, -0.2f);
uiItemL(row, IFACE_("Active Object has non-uniform scale"), ICON_NONE);
uiItemS_ex(row, 1.0f, LayoutSeparatorType::Line);
uiItemS_ex(row, 0.5f);
uiItemL(row, IFACE_("Active object has non-uniform scale"), ICON_NONE);
uiItemS_ex(row, 0.5f, LayoutSeparatorType::Line);
uiItemS_ex(row, 0.8f);
/* Return false to allow other items to be added after. */
return false;
}