[Bf-blender-cvs] [418d931490] transform-manipulators: Merge branch 'blender2.8' into transform-manipulators

[Julian Eisel]

Commit: 418d9314907355d44d792765ef00bb8058ac3887
Author: Julian Eisel
Date:   Fri Jan 20 17:05:16 2017 +0100
Branches: transform-manipulators
https://developer.blender.org/rB418d9314907355d44d792765ef00bb8058ac3887

Merge branch 'blender2.8' into transform-manipulators

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



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

diff --cc source/blender/editors/transform/transform.c
index 22c2f3aad8,6a21592db2..15de4f1328
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@@ -1693,12 -1701,9 +1701,9 @@@ static void drawHelpline(bContext *UNUS
  {
  	TransInfo *t = (TransInfo *)customdata;
  
 -	if (t->helpline != HLP_NONE && !(t->flag & T_USES_MANIPULATOR)) {
 +	if (t->helpline != HLP_NONE && (t->flag & T_DRAW_HELPLINES)) {
  		float vecrot[3], cent[2];
- 		int mval[2];
- 
- 		mval[0] = x;
- 		mval[1] = y;
+ 		float mval[3] = { x, y, 0.0f };
  
  		copy_v3_v3(vecrot, t->center);
  		if (t->flag & T_EDIT) {