Commit: 7966a7baa9d307f410f93acaf3c44d43c95c7d1c Author: Campbell Barton Date: Wed Jun 21 13:24:56 2017 +1000 Branches: custom-manipulators https://developer.blender.org/rB7966a7baa9d307f410f93acaf3c44d43c95c7d1c
Revert change that added screen to manipulator-map Temporary screens caused a crash here, if we can't assume an area will never have its screen changed better not store a back-pointer. This makes `rna_ManipulatorProperties_find_operator` search even more exhaustive. Not nice but hard to avoid :S =================================================================== M source/blender/blenkernel/BKE_screen.h M source/blender/editors/screen/area.c M source/blender/editors/space_action/space_action.c M source/blender/editors/space_buttons/space_buttons.c M source/blender/editors/space_clip/space_clip.c M source/blender/editors/space_console/space_console.c M source/blender/editors/space_file/space_file.c M source/blender/editors/space_graph/space_graph.c M source/blender/editors/space_image/space_image.c M source/blender/editors/space_info/space_info.c M source/blender/editors/space_logic/space_logic.c M source/blender/editors/space_nla/space_nla.c M source/blender/editors/space_node/space_node.c M source/blender/editors/space_outliner/space_outliner.c M source/blender/editors/space_script/space_script.c M source/blender/editors/space_sequencer/space_sequencer.c M source/blender/editors/space_text/space_text.c M source/blender/editors/space_time/space_time.c M source/blender/editors/space_userpref/space_userpref.c M source/blender/editors/space_view3d/space_view3d.c M source/blender/makesrna/intern/rna_wm_manipulator.c M source/blender/windowmanager/manipulators/WM_manipulator_api.h M source/blender/windowmanager/manipulators/intern/wm_manipulator.c M source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h M source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c =================================================================== diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h index d78ddbfca2b..6ff344fea38 100644 --- a/source/blender/blenkernel/BKE_screen.h +++ b/source/blender/blenkernel/BKE_screen.h @@ -130,7 +130,7 @@ typedef struct ARegionType { int regionid; /* unique identifier within this space, defines RGN_TYPE_xxxx */ /* add handlers, stuff you only do once or on area/region type/size changes */ - void (*init)(struct wmWindowManager *, const struct bScreen *, struct ARegion *); + void (*init)(struct wmWindowManager *, struct ARegion *); /* exit is called when the region is hidden or removed */ void (*exit)(struct wmWindowManager *, struct ARegion *); /* draw entirely, view changes should be handled here */ diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 82cb5705894..5eb51667988 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1521,7 +1521,7 @@ void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa) ed_default_handlers(wm, sa, &ar->handlers, ar->type->keymapflag); /* own handlers */ if (ar->type->init) { - ar->type->init(wm, screen, ar); + ar->type->init(wm, ar); } } else { diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c index 709f3132f11..fca54b282f8 100644 --- a/source/blender/editors/space_action/space_action.c +++ b/source/blender/editors/space_action/space_action.c @@ -185,7 +185,7 @@ static SpaceLink *action_duplicate(SpaceLink *sl) /* add handlers, stuff you only do once or on area/region changes */ -static void action_main_region_init(wmWindowManager *wm, const bScreen *UNUSED(sc), ARegion *ar) +static void action_main_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; @@ -256,7 +256,7 @@ static void action_main_region_draw(const bContext *C, ARegion *ar) } /* add handlers, stuff you only do once or on area/region changes */ -static void action_channel_region_init(wmWindowManager *wm, const bScreen *UNUSED(sc), ARegion *ar) +static void action_channel_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; @@ -298,7 +298,7 @@ static void action_channel_region_draw(const bContext *C, ARegion *ar) /* add handlers, stuff you only do once or on area/region changes */ -static void action_header_region_init(wmWindowManager *UNUSED(wm), const bScreen *UNUSED(sc), ARegion *ar) +static void action_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar) { ED_region_header_init(ar); } @@ -555,7 +555,7 @@ static void action_header_region_listener( } /* add handlers, stuff you only do once or on area/region changes */ -static void action_buttons_area_init(wmWindowManager *wm, const bScreen *UNUSED(sc), ARegion *ar) +static void action_buttons_area_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 6ec243ea5cf..299ab7171d6 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -125,7 +125,7 @@ static SpaceLink *buttons_duplicate(SpaceLink *sl) } /* add handlers, stuff you only do once or on area/region changes */ -static void buttons_main_region_init(wmWindowManager *wm, const bScreen *UNUSED(sc), ARegion *ar) +static void buttons_main_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; @@ -207,7 +207,7 @@ static void buttons_keymap(struct wmKeyConfig *keyconf) } /* add handlers, stuff you only do once or on area/region changes */ -static void buttons_header_region_init(wmWindowManager *UNUSED(wm), const bScreen *UNUSED(sc), ARegion *ar) +static void buttons_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar) { ED_region_header_init(ar); } diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index 736af4f1668..eed2acbfc68 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -1129,7 +1129,7 @@ static void movieclip_main_area_set_view2d(const bContext *C, ARegion *ar) } /* add handlers, stuff you only do once or on area/region changes */ -static void clip_main_region_init(wmWindowManager *wm, const bScreen *UNUSED(sc), ARegion *ar) +static void clip_main_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; @@ -1255,7 +1255,7 @@ static void clip_main_region_listener( /****************** preview region ******************/ -static void clip_preview_region_init(wmWindowManager *wm, const bScreen *UNUSED(sc), ARegion *ar) +static void clip_preview_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; @@ -1359,7 +1359,7 @@ static void clip_preview_region_listener( /****************** channels region ******************/ -static void clip_channels_region_init(wmWindowManager *wm, const bScreen *UNUSED(sc), ARegion *ar) +static void clip_channels_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; @@ -1403,7 +1403,7 @@ static void clip_channels_region_listener( /****************** header region ******************/ /* add handlers, stuff you only do once or on area/region changes */ -static void clip_header_region_init(wmWindowManager *UNUSED(wm), const bScreen *UNUSED(sc), ARegion *ar) +static void clip_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar) { ED_region_header_init(ar); } @@ -1438,7 +1438,7 @@ static void clip_header_region_listener( /****************** tools region ******************/ /* add handlers, stuff you only do once or on area/region changes */ -static void clip_tools_region_init(wmWindowManager *wm, const bScreen *UNUSED(sc), ARegion *ar) +static void clip_tools_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; @@ -1483,7 +1483,7 @@ static void clip_props_region_listener( /****************** properties region ******************/ /* add handlers, stuff you only do once or on area/region changes */ -static void clip_properties_region_init(wmWindowManager *wm, const bScreen *UNUSED(sc), ARegion *ar) +static void clip_properties_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; diff --git a/source/blender/editors/space_console/space_console.c b/source/blender/editors/space_console/space_console.c index 36fd3b80b5b..9a2f4b5d431 100644 --- a/source/blender/editors/space_console/space_console.c +++ b/source/blender/editors/space_console/space_console.c @@ -125,7 +125,7 @@ static SpaceLink *console_duplicate(SpaceLink *sl) /* add handlers, stuff you only do once or on area/region changes */ -static void console_main_region_init(wmWindowManager *wm, const bScreen *UNUSED(sc), ARegion *ar) +static void console_main_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; ListBase *lb; @@ -358,7 +358,7 @@ static void console_keymap(struct wmKeyConfig *keyconf) /****************** header region ******************/ /* add handlers, stuff you only do once or on area/region changes */ -static void console_header_region_init(wmWindowManager *UNUSED(wm), const bScreen *UNUSED(sc), ARegion *ar) +static void console_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar) { ED_region_header_init(ar); } diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index 8f404bb0ded..269b1146ba0 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -319,7 +319,7 @@ static void file_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, con } /* add handlers, stuff you only do once or on area/region changes */ -static void file_main_region_init(wmWindowManager *wm, const bScreen *UNUSED(sc), ARegion *ar) +static void file_main_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; @@ -582,7 +582,7 @@ static void file_keymap(struct wmKeyConfig *keyconf) } -static void file_tools_region_init(wmWindowManager *wm, const bScreen *UNUSED(sc), ARegion *ar) +static void file_tools_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; @@ -612,7 +612,7 @@ static void file_tools_region_listener( } /* add handlers, stuff you only do once or on area/region changes */ -static void file_header_region_init(wmWindowManager *wm, const bScreen *UNUSED(sc), ARegion *ar) +static void file_header_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; @@ -628,7 +628,7 @@ static void file_header_region_draw(const bContext *C, ARegion *ar) } /* add handlers, stuff you only do once or on area/region changes */ -static void file_ui_region_init(wmWindowManager *wm, const bScreen *UNUSED(sc), ARegion *ar) +static void file_ui_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c index 08469d07dbc..d2358a494d5 100644 --- a/source/blender/editors/space_graph/space_graph.c +++ b/source/blender/editors/space_graph/space_graph.c @@ -209,7 +209,7 @@ static SpaceLink *graph_duplicate(SpaceLink *sl) } /* add handlers, stuff you only do once or on area/region changes */ -static void graph_main_region_init(wmWindowManager *wm, const bScreen *UNUSED(sc), ARegion *ar) +static void graph_main_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; @@ -339,7 +339,7 @@ static void graph_main_region_draw(const bContext *C, ARegion *ar) UI_view2d_scrollers_free(scrollers); } -static void graph_channel_region_init(wmWindowManager *wm, const bScreen *UNUSED(sc), ARegion *ar) +static void graph_channel_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; @@ -387,7 +387,7 @@ static void graph_channel_region_draw(const bContext *C, ARegion *ar) } /* add handlers, stuff you only do once or on area/region changes */ -static void graph_header_region_init(wmWindowManager *UNUSED(wm), const bScreen *UNUSED(sc), AReg @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs