Commit: 64832562eb32f0a9fe39d36b2ac23c0d05c70477
Author: Julian Eisel
Date: Fri Sep 9 15:10:46 2016 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB64832562eb32f0a9fe39d36b2ac23c0d05c70477
Merge branch 'temp_manipulators_core' into wiggly-widgets
Conflicts:
source/blender/blenlib/intern/math_vector.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/windowmanager/CMakeLists.txt
===================================================================
===================================================================
diff --cc source/blender/editors/interface/resources.c
index 43dd2d8,2676581..cfe408f
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -1650,7 -1650,12 +1650,7 @@@ void init_userdef_do_versions(void
U.savetime = 1;
// XXX error(STRINGIFY(BLENDER_STARTUP_FILE)" is buggy, please
consider removing it.\n");
}
-
+ /* transform widget settings */
- 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.widget_scale == 0)
U.widget_scale = 75;
if (U.pad_rot_angle == 0.0f)
diff --cc source/blenderplayer/bad_level_call_stubs/stubs.c
index 8d58a6c,d8a4ddc..7910405
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@@ -338,18 -336,6 +338,13 @@@ void WM_jobs_callbacks(struct wmJob *jo
void WM_jobs_start(struct wmWindowManager *wm, struct wmJob *job) RET_NONE
void WM_report(ReportType type, const char *message) RET_NONE
+struct wmWidgetMapType *WM_widgetmaptype_find(const struct
wmWidgetMapType_Params *wmap_params) RET_NULL
+struct wmWidgetMapType *WM_widgetmaptype_ensure(const struct
wmWidgetMapType_Params *wmap_params) RET_NULL
+struct wmWidgetMap *WM_widgetmap_from_type(const struct
wmWidgetMapType_Params *wmap_params) RET_NULL
+void WM_widgetmap_delete(struct wmWidgetMap *wmap) RET_NONE
- struct wmWidgetGroupType *WM_widgetgrouptype_register_ptr(const struct Main
*bmain, struct wmWidgetMapType *wmaptype,
- int (*poll)(const
struct bContext *, struct wmWidgetGroupType *),
- void (*init)(const
struct bContext *, struct wmWidgetGroup *),
- wmKeyMap
*(*keymap_init)(const struct wmWidgetGroupType *wgrouptype, struct wmKeyConfig
*config),
- const char *name)
RET_NULL
+void WM_widgetgrouptype_init_runtime(const struct Main *bmain, struct
wmWidgetMapType *wmaptype, struct wmWidgetGroupType *wgrouptype) RET_NONE
+void WM_widgetgrouptype_unregister(struct bContext *C, struct Main *bmain,
struct wmWidgetGroupType *wgroup) RET_NONE
+
#ifdef WITH_INPUT_NDOF
void WM_ndof_deadzone_set(float deadzone) RET_NONE
#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
