Merge branch 'master' into blender2.8
This commit is contained in:
commit
e91bdb10e9
Notes:
blender-bot
2023-02-14 10:21:10 +01:00
Referenced by issue #56015, Crash within a few tries of attempting to render the scene with EEVEE and Freestyle enabled
|
@ -2153,7 +2153,11 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
|
|||
}
|
||||
}
|
||||
|
||||
RNA_property_boolean_set_array(op->ptr, prop, constraint_axis);
|
||||
/* Only set if needed, so we can hide in the UI when nothing is set.
|
||||
* See 'transform_poll_property'. */
|
||||
if (ELEM(true, UNPACK3(constraint_axis))) {
|
||||
RNA_property_boolean_set_array(op->ptr, prop, constraint_axis);
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
|
|
|
@ -511,6 +511,17 @@ static bool transform_poll_property(const bContext *UNUSED(C), wmOperator *op, c
|
|||
{
|
||||
const char *prop_id = RNA_property_identifier(prop);
|
||||
|
||||
/* Orientation/Constraints. */
|
||||
{
|
||||
/* Hide orientation axis if no constraints are set, since it wont be used. */
|
||||
PropertyRNA *prop_con = RNA_struct_find_property(op->ptr, "constraint_axis");
|
||||
if (prop_con && !RNA_property_is_set(op->ptr, prop_con)) {
|
||||
if (STRPREFIX(prop_id, "constraint")) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Proportional Editing. */
|
||||
{
|
||||
PropertyRNA *prop_pet = RNA_struct_find_property(op->ptr, "proportional");
|
||||
|
|
Loading…
Reference in New Issue