[Bf-blender-cvs] [62afcde] temp_manipulators_core: Remove unneeded UserPref options

Julian Eisel noreply at git.blender.org
Thu Oct 6 21:35:23 CEST 2016


Commit: 62afcdedc50670ac284eeb90c51b46d22fff20b5
Author: Julian Eisel
Date:   Thu Oct 6 21:34:04 2016 +0200
Branches: temp_manipulators_core
https://developer.blender.org/rB62afcdedc50670ac284eeb90c51b46d22fff20b5

Remove unneeded UserPref options

At least initial merge we don't need them.

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

M	source/blender/makesdna/DNA_userdef_types.h
M	source/blender/makesdna/DNA_view3d_types.h
M	source/blender/windowmanager/manipulators/intern/wm_manipulator.c

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

diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index b505399..b547dab 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -490,8 +490,7 @@ typedef struct UserDef {
 	short tb_leftmouse, tb_rightmouse;
 	struct SolidLight light[3];
 	short tw_hotspot, tw_flag, tw_handlesize, tw_size;
-	short manipulator_flag, manipulator_scale;
-	int pad3;
+	short manipulator_scale, pad3[3];
 	short textimeout, texcollectrate;
 	short wmdrawmethod; /* removed wmpad */
 	short dragthreshold;
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 6e31c75..c131629 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -368,8 +368,6 @@ enum {
 #define V3D_USE_MANIPULATOR		1
 #define V3D_DRAW_MANIPULATOR	2
 /* #define V3D_CALC_MANIPULATOR	4 */ /*UNUSED*/
-#define V3D_3D_MANIPULATORS          (1 << 2)
-#define V3D_SHADED_MANIPULATORS      (1 << 3)
 
 /* BGPic->flag */
 /* may want to use 1 for select ? */
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
index 6cbbcf7..824141d 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
@@ -341,7 +341,7 @@ void wm_manipulator_calculate_scale(wmManipulator *manipulator, const bContext *
 	float scale = 1.0f;
 
 	if (manipulator->mgroup->type->flag & WM_MANIPULATORGROUPTYPE_SCALE_3D) {
-		if (rv3d && (U.manipulator_flag & V3D_3D_MANIPULATORS) == 0) {
+		if (rv3d /*&& (U.manipulator_flag & V3D_3D_MANIPULATORS) == 0*/) { /* UserPref flag might be useful for later */
 			if (manipulator->get_final_position) {
 				float position[3];




More information about the Bf-blender-cvs mailing list