[Bf-blender-cvs] [29bb10e] master: Fix transform center2d for 2d views

Campbell Barton noreply at git.blender.org
Tue Mar 29 22:14:43 CEST 2016


Commit: 29bb10ee964a23df393442ceb98ddaf747c8c5f1
Author: Campbell Barton
Date:   Wed Mar 30 07:15:33 2016 +1100
Branches: master
https://developer.blender.org/rB29bb10ee964a23df393442ceb98ddaf747c8c5f1

Fix transform center2d for 2d views

While this didn't show up as a bug, the center2d was being calculated with a zero aspect,
causing TransInfo.center2d to be NAN.

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

M	source/blender/editors/transform/transform_generics.c

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

diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 8c97dfd..eb6308d 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1421,8 +1421,8 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 	}
 #endif
 
-	setTransformViewMatrices(t);
 	setTransformViewAspect(t, t->aspect);
+	setTransformViewMatrices(t);
 	initNumInput(&t->num);
 }
 
@@ -1582,6 +1582,8 @@ void restoreTransObjects(TransInfo *t)
 
 void calculateCenter2D(TransInfo *t)
 {
+	BLI_assert(!is_zero_v3(t->aspect));
+
 	if (t->flag & (T_EDIT | T_POSE)) {
 		Object *ob = t->obedit ? t->obedit : t->poseobj;
 		float vec[3];




More information about the Bf-blender-cvs mailing list