diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-08-08 10:15:41 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-09 11:02:10 +0300 |
commit | f0d4420cc0624da5238a317cfa3d08204c35a3dc (patch) | |
tree | 757739260facf62bba27cb125c91c69b1c415bb6 /source/blender | |
parent | 00f22403ac9dce95117cb6ef5c948f1da881f05d (diff) |
Fix spin rotate axis
Also disable lamp-target for cameras (might enable later).
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/mesh/editmesh_extrude.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_manipulator_lamp.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c index 315882bd764..4be16d73757 100644 --- a/source/blender/editors/mesh/editmesh_extrude.c +++ b/source/blender/editors/mesh/editmesh_extrude.c @@ -880,7 +880,7 @@ static void manipulator_mesh_spin_update_from_op(ManipulatorSpinGroup *man) normalize_v3(man->data.rotate_up); WM_manipulator_set_matrix_rotation_from_z_axis(man->translate_c, plane_no); - WM_manipulator_set_matrix_rotation_from_yz_axis(man->rotate_c, man->data.rotate_axis, plane_no); + WM_manipulator_set_matrix_rotation_from_yz_axis(man->rotate_c, plane_no, man->data.rotate_axis); /* show the axis instead of mouse cursor */ RNA_enum_set(man->rotate_c->ptr, "draw_options", diff --git a/source/blender/editors/space_view3d/view3d_manipulator_lamp.c b/source/blender/editors/space_view3d/view3d_manipulator_lamp.c index 9e5120ad1f0..ff4b0842981 100644 --- a/source/blender/editors/space_view3d/view3d_manipulator_lamp.c +++ b/source/blender/editors/space_view3d/view3d_manipulator_lamp.c @@ -240,9 +240,11 @@ static bool WIDGETGROUP_lamp_target_poll(const bContext *C, wmManipulatorGroupTy Lamp *la = ob->data; return (ELEM(la->type, LA_SUN, LA_SPOT, LA_HEMI, LA_AREA)); } +#if 0 else if (ob->type == OB_CAMERA) { return true; } +#endif } return false; } |