Commit: c5d8a674f943a72f44dfe3f40d7477a6a0549e5f
Author: Julian Eisel
Date: Thu Sep 29 00:22:20 2016 +0200
Branches: custom-manipulators
https://developer.blender.org/rBc5d8a674f943a72f44dfe3f40d7477a6a0549e5f
Merge branch 'temp_manipulators_core' into custom-manipulators
Conflicts:
source/blender/blenkernel/BKE_screen.h
source/blender/blenkernel/intern/screen.c
source/blender/editors/interface/resources.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/space_api/spacetypes.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/manipulators/WM_manipulator_api.h
source/blender/windowmanager/manipulators/WM_manipulator_types.h
source/blender/windowmanager/manipulators/intern/wm_manipulator.c
source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c
source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h
===================================================================
===================================================================
diff --cc source/blender/makesdna/DNA_screen_types.h
index c89aaff,9ac1852..9f870d3
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@@ -265,11 -264,11 +265,12 @@@ typedef struct ARegion
ListBase ui_lists; /* uiList */
ListBase ui_previews; /* uiPreview */
ListBase handlers; /* wmEventHandler */
+ ListBase manipulator_maps; /* wmManipulatorMap */
ListBase panels_category; /* Panel categories runtime */
-
+
+ struct wmManipulatorMap *manipulator_map; /* manipulator map of this
region */
struct wmTimer *regiontimer; /* blend in/out */
-
+
char *headerstr; /* use this string to draw info
*/
void *regiondata; /* XXX 2.50, need spacedata
equivalent? */
} ARegion;
diff --cc source/blender/windowmanager/wm.h
index 3960290,3dd2941..2c4342c
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@@ -33,16 -33,9 +33,18 @@@
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"
+ #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
