bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: early return & avoid compare strings unnecessarily

Browse Source 
`transform_poll_property` can be smarter in the conditions.
This commit is contained in:
Germano Cavalcante 2024-03-13 12:11:11 -03:00
parent 57b148efbc
commit 31745a53f4
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
source/blender/editors/transform/transform_ops.cc
View File

@ -558,33 +558,28 @@ static bool transform_poll_property(const bContext *C, wmOperator *op, const Pro
const char *prop_id = RNA_property_identifier(prop);
/* Orientation/Constraints. */
{
if (STRPREFIX(prop_id, "constraint")) {
/* Hide orientation axis if no constraints are set, since it won't be used. */
PropertyRNA *prop_con = RNA_struct_find_property(op->ptr, "orient_type");
if (!ELEM(prop_con, nullptr, prop)) {
if (STRPREFIX(prop_id, "constraint")) {
/* Special case: show constraint axis if we don't have values,
* needed for mirror operator. */
if (STREQ(prop_id, "constraint_axis") &&
(RNA_struct_find_property(op->ptr, "value") == nullptr))
{
return true;
}
return false;
/* Special case: show constraint axis if we don't have values,
* needed for mirror operator. */
if (STREQ(prop_id, "constraint_axis") &&
(RNA_struct_find_property(op->ptr, "value") == nullptr))
{
return true;
}
return false;
}
return true;
}
/* Orientation Axis. */
{
if (STREQ(prop_id, "orient_axis")) {
eTfmMode mode = (eTfmMode)transformops_mode(op);
if (mode == TFM_ALIGN) {
return false;
}
}
if (STREQ(prop_id, "orient_axis")) {
eTfmMode mode = (eTfmMode)transformops_mode(op);
return mode != TFM_ALIGN;
}
/* Proportional Editing. */
@ -604,15 +599,12 @@ static bool transform_poll_property(const bContext *C, wmOperator *op, const Pro
* - "use_proportional_projected". */
return false;
}
return true;
}
/* Snapping. */
{
if (STREQ(prop_id, "use_snap_project")) {
if (RNA_boolean_get(op->ptr, "snap") == false) {
return false;
}
}
if (STREQ(prop_id, "use_snap_project")) {
return RNA_boolean_get(op->ptr, "snap");
}
return true;