Commit: f1e7f6ec580c290ab539956f2a0cbeecab9a5739
Author: Julian Eisel
Date: Fri Jan 20 17:05:49 2017 +0100
Branches: custom-manipulators
https://developer.blender.org/rBf1e7f6ec580c290ab539956f2a0cbeecab9a5739
Merge branch 'blender2.8' into custom-manipulators
===================================================================
===================================================================
diff --cc source/blender/editors/transform/transform.c
index 2f8836a5b9,6a21592db2..6cee6a9817
--- 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) {
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) {
diff --cc source/blender/windowmanager/manipulators/intern/wm_manipulator.c
index 55ff1296e4,7fdbb0d632..2111b8c5d3
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
@@@ -31,11 -31,9 +31,11 @@@
#include "BLI_listbase.h"
#include "BLI_math.h"
- #include "BLI_path_util.h"
#include "BLI_string.h"
+ #include "BLI_string_utils.h"
+#include "DNA_manipulator_types.h"
+
#include "ED_screen.h"
#include "ED_view3d.h"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
