Commit: d38b4d4f2d8fa080200612597cf1d222549fde81
Author: Campbell Barton
Date: Mon Jan 22 20:33:43 2018 +1100
Branches: blender-v2.79-release
https://developer.blender.org/rBd38b4d4f2d8fa080200612597cf1d222549fde81
Revert "Fix T53850: Lock to Cursor breaks 3D manipulators"
This reverts commit f93a6857d8dc15d4be81feafd6dad6ef04d0bd31.
Was intended for 'blender-v2.79a-release' branch.
===================================================================
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_intern.h
M source/blender/editors/space_view3d/view3d_view.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_draw.c
b/source/blender/editors/space_view3d/view3d_draw.c
index f614f235c66..250e6559b8f 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2744,17 +2744,10 @@ void ED_view3d_update_viewmat(
view3d_winmatrix_set(ar, v3d, rect);
/* setup view matrix */
- if (viewmat) {
+ if (viewmat)
copy_m4_m4(rv3d->viewmat, viewmat);
- }
- else {
- float rect_scale[2];
- if (rect) {
- rect_scale[0] = (float)BLI_rcti_size_x(rect) /
(float)ar->winx;
- rect_scale[1] = (float)BLI_rcti_size_y(rect) /
(float)ar->winy;
- }
- view3d_viewmatrix_set(scene, v3d, rv3d, rect ? rect_scale :
NULL); /* note: calls BKE_object_where_is_calc for camera... */
- }
+ else
+ view3d_viewmatrix_set(scene, v3d, rv3d); /* note: calls
BKE_object_where_is_calc for camera... */
/* update utility matrices */
mul_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat);
diff --git a/source/blender/editors/space_view3d/view3d_intern.h
b/source/blender/editors/space_view3d/view3d_intern.h
index b1ccb508e50..7a106a27833 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -248,7 +248,7 @@ void ED_view3d_smooth_view_force_finish(
struct View3D *v3d, struct ARegion *ar);
void view3d_winmatrix_set(ARegion *ar, const View3D *v3d, const rcti *rect);
-void view3d_viewmatrix_set(Scene *scene, const View3D *v3d, RegionView3D
*rv3d, const float rect_scale[2]);
+void view3d_viewmatrix_set(Scene *scene, const View3D *v3d, RegionView3D
*rv3d);
void fly_modal_keymap(struct wmKeyConfig *keyconf);
void walk_modal_keymap(struct wmKeyConfig *keyconf);
diff --git a/source/blender/editors/space_view3d/view3d_view.c
b/source/blender/editors/space_view3d/view3d_view.c
index 6ebd19aba85..5c13fd37dda 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -1024,18 +1024,8 @@ bool ED_view3d_lock(RegionView3D *rv3d)
return ED_view3d_quat_from_axis_view(rv3d->view, rv3d->viewquat);
}
-/**
- * Sets #RegionView3D.viewmat
- *
- * \param scene: Scene for camera and cursor location.
- * \param v3d: View 3D space data.
- * \param rv3d: 3D region which stores the final matrices.
- * \param rect_scale: Optional 2D scale argument,
- * Use when displaying a sub-region, eg: when #view3d_winmatrix_set takes a
'rect' argument.
- *
- * \note don't set windows active in here, is used by renderwin too.
- * */
-void view3d_viewmatrix_set(Scene *scene, const View3D *v3d, RegionView3D
*rv3d, const float rect_scale[2])
+/* don't set windows active in here, is used by renderwin too */
+void view3d_viewmatrix_set(Scene *scene, const View3D *v3d, RegionView3D *rv3d)
{
if (rv3d->persp == RV3D_CAMOB) { /* obs/camera */
if (v3d->camera) {
@@ -1094,12 +1084,6 @@ void view3d_viewmatrix_set(Scene *scene, const View3D
*v3d, RegionView3D *rv3d,
mul_v2_v2fl(vec, rv3d->ofs_lock, rv3d->is_persp ?
rv3d->dist : 1.0f);
vec[2] = 0.0f;
-
- if (rect_scale) {
- vec[0] /= rect_scale[0];
- vec[1] /= rect_scale[1];
- }
-
mul_mat3_m4_v3(persinv, vec);
translate_m4(rv3d->viewmat, vec[0], vec[1], vec[2]);
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
