[Bf-blender-cvs] [f7829787da5] master: Fix T80704: bpy.ops.transform.rotate() ignores orient_type
Germano Cavalcante
noreply at git.blender.org
Mon Sep 14 20:56:15 CEST 2020
Commit: f7829787da5c64b3fa715a042c2a45ecd4314676
Author: Germano Cavalcante
Date: Mon Sep 14 15:33:36 2020 -0300
Branches: master
https://developer.blender.org/rBf7829787da5c64b3fa715a042c2a45ecd4314676
Fix T80704: bpy.ops.transform.rotate() ignores orient_type
Remove the condition preventing orientation from being obtained out of
the 3d View context.
Also pass the `ob` and `obedit` arguments obtained from the caller.
===================================================================
M source/blender/editors/include/ED_transform.h
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_orientations.c
===================================================================
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h
index d6af119dae0..0ea86e006e0 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -130,6 +130,8 @@ bool BIF_createTransformOrientation(struct bContext *C,
void BIF_selectTransformOrientation(struct bContext *C, struct TransformOrientation *target);
void ED_getTransformOrientationMatrix(const struct bContext *C,
+ struct Object *ob,
+ struct Object *obedit,
const short around,
float r_orientation_mat[3][3]);
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index b643885ca62..76ca4ed55b2 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -3949,8 +3949,9 @@ static int view_axis_exec(bContext *C, wmOperator *op)
Object *obact = CTX_data_active_object(C);
if (obact != NULL) {
float twmat[3][3];
+ Object *obedit = CTX_data_edit_object(C);
/* same as transform gizmo when normal is set */
- ED_getTransformOrientationMatrix(C, V3D_AROUND_ACTIVE, twmat);
+ ED_getTransformOrientationMatrix(C, obact, obedit, V3D_AROUND_ACTIVE, twmat);
align_quat = align_quat_buf;
mat3_to_quat(align_quat, twmat);
invert_qt_normalized(align_quat);
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 31e8f262557..0e141b542cf 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -721,6 +721,8 @@ enum {
#define ORIENTATION_USE_PLANE(ty) ELEM(ty, ORIENTATION_NORMAL, ORIENTATION_EDGE, ORIENTATION_FACE)
int getTransformOrientation_ex(const struct bContext *C,
+ struct Object *ob,
+ struct Object *obedit,
float normal[3],
float plane[3],
const short around);
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c
index f7462464683..5a90b59b505 100644
--- a/source/blender/editors/transform/transform_orientations.c
+++ b/source/blender/editors/transform/transform_orientations.c
@@ -475,7 +475,7 @@ short ED_transform_calc_orientation_from_type_ex(const bContext *C,
}
case V3D_ORIENT_NORMAL: {
if (obedit || (ob && ob->mode & OB_MODE_POSE)) {
- ED_getTransformOrientationMatrix(C, pivot_point, r_mat);
+ ED_getTransformOrientationMatrix(C, ob, obedit, pivot_point, r_mat);
return V3D_ORIENT_NORMAL;
}
/* no break we define 'normal' as 'local' in Object mode */
@@ -488,7 +488,7 @@ short ED_transform_calc_orientation_from_type_ex(const bContext *C,
* use the active pones axis for display [#33575], this works as expected on a single
* bone and users who select many bones will understand what's going on and what local
* means when they start transforming */
- ED_getTransformOrientationMatrix(C, pivot_point, r_mat);
+ ED_getTransformOrientationMatrix(C, ob, obedit, pivot_point, r_mat);
}
else {
copy_m3_m4(r_mat, ob->obmat);
@@ -539,33 +539,52 @@ short transform_orientation_matrix_get(bContext *C,
const float custom[3][3],
float r_spacemtx[3][3])
{
+ Object *ob = NULL;
+ Object *obedit = NULL;
+ Scene *scene = NULL;
+ RegionView3D *rv3d = NULL;
+ int orientation_index_custom = 0;
+
if (orientation == V3D_ORIENT_CUSTOM_MATRIX) {
copy_m3_m3(r_spacemtx, custom);
return V3D_ORIENT_CUSTOM_MATRIX;
}
- if ((t->spacetype == SPACE_VIEW3D) && (t->region->regiontype == RGN_TYPE_WINDOW)) {
- Object *ob = CTX_data_active_object(C);
- Object *obedit = CTX_data_active_object(C);
- RegionView3D *rv3d = t->region->regiondata;
- int orientation_index_custom = 0;
-
- if (orientation >= V3D_ORIENT_CUSTOM) {
- orientation_index_custom = orientation - V3D_ORIENT_CUSTOM;
- }
-
- return ED_transform_calc_orientation_from_type_ex(
- C,
- r_spacemtx,
- /* extra args (can be accessed from context) */
- t->scene,
- rv3d,
- ob,
- obedit,
- orientation,
- orientation_index_custom,
- t->around);
+ if (orientation >= V3D_ORIENT_CUSTOM) {
+ orientation_index_custom = orientation - V3D_ORIENT_CUSTOM;
}
+ switch (orientation) {
+ case V3D_ORIENT_GIMBAL:
+ case V3D_ORIENT_LOCAL:
+ case V3D_ORIENT_NORMAL:
+ ob = CTX_data_active_object(C);
+ obedit = CTX_data_edit_object(C);
+ break;
+ case V3D_ORIENT_VIEW:
+ if ((t->spacetype == SPACE_VIEW3D) && (t->region->regiontype == RGN_TYPE_WINDOW)) {
+ rv3d = t->region->regiondata;
+ }
+ break;
+ case V3D_ORIENT_CURSOR:
+ case V3D_ORIENT_CUSTOM:
+ scene = t->scene;
+ break;
+ case V3D_ORIENT_GLOBAL:
+ case V3D_ORIENT_CUSTOM_MATRIX:
+ default:
+ break;
+ }
+
+ return ED_transform_calc_orientation_from_type_ex(C,
+ r_spacemtx,
+ /* extra args (can be accessed from context) */
+ scene,
+ rv3d,
+ ob,
+ obedit,
+ orientation,
+ orientation_index_custom,
+ t->around);
unit_m3(r_spacemtx);
return V3D_ORIENT_GLOBAL;
@@ -685,15 +704,15 @@ static uint bm_mesh_faces_select_get_n(BMesh *bm, BMVert **elems, const uint n)
#endif
int getTransformOrientation_ex(const bContext *C,
+ struct Object *ob,
+ struct Object *obedit,
float normal[3],
float plane[3],
const short around)
{
ViewLayer *view_layer = CTX_data_view_layer(C);
View3D *v3d = CTX_wm_view3d(C);
- Object *obedit = CTX_data_edit_object(C);
Base *base;
- Object *ob = OBACT(view_layer);
int result = ORIENTATION_NONE;
const bool activeOnly = (around == V3D_AROUND_ACTIVE);
@@ -1218,13 +1237,18 @@ int getTransformOrientation_ex(const bContext *C,
int getTransformOrientation(const bContext *C, float normal[3], float plane[3])
{
+ Object *obact = CTX_data_active_object(C);
+ Object *obedit = CTX_data_edit_object(C);
+
/* dummy value, not V3D_AROUND_ACTIVE and not V3D_AROUND_LOCAL_ORIGINS */
short around = V3D_AROUND_CENTER_BOUNDS;
- return getTransformOrientation_ex(C, normal, plane, around);
+ return getTransformOrientation_ex(C, obact, obedit, normal, plane, around);
}
void ED_getTransformOrientationMatrix(const bContext *C,
+ struct Object *ob,
+ struct Object *obedit,
const short around,
float r_orientation_mat[3][3])
{
@@ -1233,7 +1257,7 @@ void ED_getTransformOrientationMatrix(const bContext *C,
int type;
- type = getTransformOrientation_ex(C, normal, plane, around);
+ type = getTransformOrientation_ex(C, ob, obedit, normal, plane, around);
/* Fallback, when the plane can't be calculated. */
if (ORIENTATION_USE_PLANE(type) && is_zero_v3(plane)) {
More information about the Bf-blender-cvs
mailing list