archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-07-26 15:51:29 +10:00
parent 0dd3b200b0 44370a307c
commit e91bdb10e9
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/transform/transform.c
View File

@@ -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);
}
}
{

11
source/blender/editors/transform/transform_ops.c
View File

@@ -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");