Commit: 1486c171ac63afe31dc59f60b9eecb938b0c2dbf
Author: Julian Eisel
Date: Sun Sep 11 23:25:47 2016 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB1486c171ac63afe31dc59f60b9eecb938b0c2dbf
Merge branch 'temp_manipulators_core' into wiggly-widgets
Conflicts:
source/blender/blenkernel/intern/screen.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/screen/screen_edit.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operators.c
source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
===================================================================
diff --cc source/blender/editors/interface/resources.c
index cfe408f,4f30bf4..d9fb514
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -1651,8 -1651,13 +1651,8 @@@ void init_userdef_do_versions(void
// XXX error(STRINGIFY(BLENDER_STARTUP_FILE)" is buggy, please
consider removing it.\n");
}
/* transform widget settings */
- if (U.widget_scale == 0)
- U.widget_scale = 75;
- if (U.tw_hotspot == 0) {
- U.tw_hotspot = 14;
- U.tw_size = 25; /* percentage of window size */
- U.tw_handlesize = 16; /* percentage of widget radius */
- }
+ if (U.manipulator_scale == 0)
+ U.manipulator_scale = 75;
if (U.pad_rot_angle == 0.0f)
U.pad_rot_angle = 15.0f;
diff --cc source/blender/makesdna/DNA_userdef_types.h
index e2ef77c,14dd3f9..192e1d9
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@@ -489,7 -489,8 +489,7 @@@ typedef struct UserDef
short gp_settings;
short tb_leftmouse, tb_rightmouse;
struct SolidLight light[3];
- short widget_flag, widget_scale;
- short tw_hotspot, tw_flag, tw_handlesize, tw_size;
+ short manipulator_flag, manipulator_scale;
int pad3;
short textimeout, texcollectrate;
short wmdrawmethod; /* removed wmpad */
diff --cc source/blender/makesdna/DNA_view3d_types.h
index 00692d4,0ba5c9387..b8f0e48
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@@ -362,11 -363,13 +362,11 @@@ enum
#define V3D_MANIP_GIMBAL 4
#define V3D_MANIP_CUSTOM 5 /* anything of value 5 or higher is
custom */
- /* View3d->widget_flag */
-/* View3d->twflag */
++/* View3d->manipulator_flag */
/* USE = user setting, DRAW = based on selection */
- #define V3D_USE_MANIPULATOR (1 << 0)
- #define V3D_3D_WIDGETS (1 << 1)
- #define V3D_SHADED_WIDGETS (1 << 2)
+ #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)
++#define V3D_3D_MANIPULATORS (1 << 1)
++#define V3D_SHADED_MANIPULATORS (1 << 2)
/* BGPic->flag */
/* may want to use 1 for select ? */
diff --cc source/blender/windowmanager/intern/wm_operators.c
index a1df469,97893bd..25f506f
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@@ -175,10 -175,6 +175,10 @@@ void WM_operatortype_append(void (*opfu
ot->name = N_("Dummy Name");
}
- if (ot->wgrouptype) {
- ot->wgrouptype->flag |= WM_MANIPULATORGROUPTYPE_OP;
++ if (ot->mgrouptype) {
++ ot->mgrouptype->flag |= WM_MANIPULATORGROUPTYPE_OP;
+ }
+
/* XXX All ops should have a description but for now allow them not to.
*/
RNA_def_struct_ui_text(ot->srna, ot->name, ot->description ?
ot->description : UNDOCUMENTED_OPERATOR_TIP);
RNA_def_struct_identifier(ot->srna, ot->idname);
diff --cc source/blender/windowmanager/wm.h
index 8ea2cf9,3dd2941..3960290
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@@ -33,14 -33,9 +33,16 @@@
struct wmWindow;
struct ReportList;
+struct wmEvent;
+struct wmOperatorType;
+struct PointerRNA;
+struct PropertyRNA;
+struct wmOperator;
+
+#include "manipulators/wm_manipulator_wmapi.h" /* manipulators wm API */
+ #include "manipulators/wm_manipulator_wmapi.h"
+
typedef struct wmPaintCursor {
struct wmPaintCursor *next, *prev;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
