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

Fix T46003: Scale w/ script ignores axis-align

Browse Source
This commit is contained in:
Campbell Barton
2015-09-09 02:05:10 +10:00
parent 91264cfdd0
commit a2b80d4c48
7 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/editors/transform/transform_generics.c
View File

@@ -1207,18 +1207,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
t->around = V3D_CURSOR;
}
if (op && ((prop = RNA_struct_find_property(op->ptr, "constraint_orientation")) &&
RNA_property_is_set(op->ptr, prop)))
{
t->current_orientation = RNA_property_enum_get(op->ptr, prop);
if (t->current_orientation >= V3D_MANIP_CUSTOM + BIF_countTransformOrientation(C)) {
t->current_orientation = V3D_MANIP_GLOBAL;
}
}
else {
t->current_orientation = v3d->twmode;
}
t->current_orientation = v3d->twmode;
/* exceptional case */
if (t->around == V3D_LOCAL) {
@@ -1305,6 +1294,16 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
}
t->around = V3D_CENTER;
}
if (op && ((prop = RNA_struct_find_property(op->ptr, "constraint_orientation")) &&
RNA_property_is_set(op->ptr, prop)))
{
t->current_orientation = RNA_property_enum_get(op->ptr, prop);
if (t->current_orientation >= V3D_MANIP_CUSTOM + BIF_countTransformOrientation(C)) {
t->current_orientation = V3D_MANIP_GLOBAL;
}
}
if (op && ((prop = RNA_struct_find_property(op->ptr, "release_confirm")) &&
RNA_property_is_set(op->ptr, prop)))