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

Transform: don't set the user constraint when it's not set

Browse Source 
The orientation for the redo panel would be set even when not used,
add an 'unset' orientation which defaults to global.
This commit is contained in:
Campbell Barton
2019-02-26 20:17:40 +11:00
parent 13dd8b69f0
commit 0a87bf6784
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2171,7 +2171,7 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
if ((prop = RNA_struct_find_property(op->ptr, "constraint_axis"))) {
/* constraint orientation can be global, even if user selects something else
* so use the orientation in the constraint if set */
short orientation = (t->con.mode & CON_APPLY) ? t->con.orientation : t->orientation.user;
short orientation = (t->con.mode & CON_APPLY) ? t->con.orientation : t->orientation.unset;
if (orientation == V3D_ORIENT_CUSTOM) {
const int orientation_index_custom = BKE_scene_transform_orientation_get_index(
@@ -2194,7 +2194,7 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
RNA_enum_set(op->ptr, "constraint_matrix_orientation", orientation);
}
}
if (t->con.mode & CON_APPLY) {
if (t->con.mode & CON_APPLY || (t->orientation.unset != V3D_ORIENT_GLOBAL)) {
RNA_float_set_array(op->ptr, "constraint_matrix", &t->con.mtx[0][0]);
}
else {