[Bf-blender-cvs] [c52c11b] wiggly-widgets: Remove redundant fixes

[Julian Eisel]

Commit: c52c11b30421e58dc3718ba50d2bb07249c90bfc
Author: Julian Eisel
Date:   Fri Sep 11 01:24:32 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBc52c11b30421e58dc3718ba50d2bb07249c90bfc

Remove redundant fixes

Not needed anymore since rB10678f7572ee0d37

===================================================================

M	source/blender/editors/transform/transform_manipulator.c
M	source/blender/windowmanager/intern/wm_widgets.c

===================================================================

diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index fb2bd9f..309c538 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -847,8 +847,6 @@ static int calc_manipulator_stats(const bContext *C)
 		}
 	}
 	else {
-		float loc[3];
-
 		/* we need the one selected object, if its not active */
 		ob = OBACT;
 		if (ob && !(ob->flag & SELECT))
@@ -859,9 +857,7 @@ static int calc_manipulator_stats(const bContext *C)
 				if (ob == NULL)
 					ob = base->object;
 
-				/* updated object matrix after transform */
-				add_v3_v3v3(loc, base->object->loc, base->object->dloc);
-				calc_tw_center(scene, loc);
+				calc_tw_center(scene, base->object->loc);
 				protectflag_to_drawflags(base->object->protectflag, &rv3d->twdrawflag);
 				totsel++;
 			}
@@ -956,11 +952,7 @@ static void manipulator_prepare_mat(Scene *scene, View3D *v3d, RegionView3D *rv3
 		{
 			Object *ob = OBACT;
 			if ((v3d->around == V3D_ACTIVE) && !scene->obedit && !(ob->mode & OB_MODE_POSE)) {
-				float loc[3];
-
-				/* updated object matrix after transform */
-				add_v3_v3v3(loc, ob->loc, ob->dloc);
-				copy_v3_v3(rv3d->twmat[3], loc);
+				copy_v3_v3(rv3d->twmat[3], ob->obmat[3]);
 			}
 			else {
 				mid_v3_v3v3(rv3d->twmat[3], scene->twmin, scene->twmax);
diff --git a/source/blender/windowmanager/intern/wm_widgets.c b/source/blender/windowmanager/intern/wm_widgets.c
index c53d078..c07641b 100644
--- a/source/blender/windowmanager/intern/wm_widgets.c
+++ b/source/blender/windowmanager/intern/wm_widgets.c
@@ -239,8 +239,6 @@ static void widget_calculate_scale(wmWidget *widget, const bContext *C)
 	float scale = 1.0f;
 
 	if (rv3d && (U.tw_flag & V3D_3D_WIDGETS) == 0 && (widget->flag & WM_WIDGET_SCALE_3D)) {
-		ED_view3d_update_viewmat(CTX_data_scene(C), CTX_wm_view3d(C), CTX_wm_region(C), NULL, NULL);
-
 		if (widget->get_final_position) {
 			float position[3];