Commit: 8f1fd463fa92ffcb4c698f5095af7c677357e434
Author: Julian Eisel
Date: Sun Dec 20 21:43:07 2015 +0100
Branches: temp_widgets_c++_experiment
https://developer.blender.org/rB8f1fd463fa92ffcb4c698f5095af7c677357e434
Merge branch 'wiggly-widgets' into temp_widgets_c++_experiment
Conflicts:
source/blender/windowmanager/WM_api.h
===================================================================
===================================================================
diff --cc source/blender/windowmanager/WM_api.h
index c45a795,7810552..90848b1
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@@ -512,11 -510,12 +512,9 @@@ struct wmWidget *WM_widget_new(void (*d
int (*intersect)(struct bContext *, const
struct wmEvent *, struct wmWidget *),
int (*handler)(struct bContext *, const
struct wmEvent *, struct wmWidget *, const int));
-void WM_widgetmap_widgets_update(const struct bContext *C, struct
wmWidgetMap *wmap);
-void WM_widgetmap_widgets_draw(const struct bContext *C, const struct
wmWidgetMap *wmap,
- const bool in_scene, const bool free_drawwidgets);
void WM_event_add_area_widgetmap_handlers(struct ARegion *ar);
void WM_modal_handler_attach_widgetgroup(struct bContext *C, struct
wmEventHandler *handler,
- struct wmWidgetGroupType
*wgrouptype, struct wmOperator *op);
+ struct wmWidgetGroupTypeC
*wgrouptype, struct wmOperator *op);
- void WM_widgetgroup_customdata_set(struct wmWidgetGroup *wgroup, void *data);
- void *WM_widgetgroup_customdata(const struct wmWidgetGroup *wgroup);
/* wmWidget->flag */
enum widgetflags {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
