diff options
| -rw-r--r-- | source/blender/editors/animation/anim_markers.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_markers.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/include/UI_view2d.h | 4 | ||||
| -rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_api/spacetypes.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_text/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index f95807b55ea..49e136f6e95 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -1494,7 +1494,7 @@ void ED_operatortypes_marker(void) } /* called in screen_ops.c:ED_keymap_screen() */ -void ED_marker_keymap(wmKeyConfig *keyconf) +void ED_keymap_marker(wmKeyConfig *keyconf) { wmKeyMap *keymap = WM_keymap_find(keyconf, "Markers", 0, 0); wmKeyMapItem *kmi; diff --git a/source/blender/editors/include/ED_markers.h b/source/blender/editors/include/ED_markers.h index cb065646f0a..76d36623b60 100644 --- a/source/blender/editors/include/ED_markers.h +++ b/source/blender/editors/include/ED_markers.h @@ -69,7 +69,7 @@ struct TimeMarker *ED_markers_get_first_selected(ListBase *markers); /* called in screen_ops.c:ED_operatortypes_screen() */ void ED_operatortypes_marker(void); /* called in screen_ops.c:ED_keymap_screen() */ -void ED_marker_keymap(struct wmKeyConfig *keyconf); +void ED_keymap_marker(struct wmKeyConfig *keyconf); /* called in animation editors - keymap defines */ void ED_marker_keymap_animedit_conflictfree(struct wmKeyMap *keymap); diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h index fe8ddee136c..1208446e14d 100644 --- a/source/blender/editors/include/UI_view2d.h +++ b/source/blender/editors/include/UI_view2d.h @@ -215,8 +215,8 @@ void UI_view2d_text_cache_rectf(struct View2D *v2d, const struct rctf *rect, con void UI_view2d_text_cache_draw(struct ARegion *ar); /* operators */ -void UI_view2d_operatortypes(void); -void UI_view2d_keymap(struct wmKeyConfig *keyconf); +void ED_operatortypes_view2d(void); +void ED_keymap_view2d(struct wmKeyConfig *keyconf); void UI_view2d_smooth_view(struct bContext *C, struct ARegion *ar, const struct rctf *cur, const int smooth_viewtx); diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 41683b1cd12..2271b91806b 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -1992,7 +1992,7 @@ static void VIEW2D_OT_reset(wmOperatorType *ot) /* ********************************************************* */ /* Registration */ -void UI_view2d_operatortypes(void) +void ED_operatortypes_view2d(void) { WM_operatortype_append(VIEW2D_OT_pan); @@ -2016,7 +2016,7 @@ void UI_view2d_operatortypes(void) WM_operatortype_append(VIEW2D_OT_reset); } -void UI_view2d_keymap(wmKeyConfig *keyconf) +void ED_keymap_view2d(wmKeyConfig *keyconf) { wmKeyMap *keymap = WM_keymap_find(keyconf, "View2D", 0, 0); wmKeyMapItem *kmi; diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index e2262398a52..83040a26480 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -119,7 +119,7 @@ void ED_spacetypes_init(void) ED_operatortypes_mask(); ED_operatortypes_io(); - UI_view2d_operatortypes(); + ED_operatortypes_view2d(); UI_buttons_operatortypes(); /* register operators */ @@ -177,9 +177,9 @@ void ED_spacetypes_keymap(wmKeyConfig *keyconf) ED_keymap_metaball(keyconf); ED_keymap_paint(keyconf); ED_keymap_mask(keyconf); - ED_marker_keymap(keyconf); + ED_keymap_marker(keyconf); - UI_view2d_keymap(keyconf); + ED_keymap_view2d(keyconf); spacetypes = BKE_spacetypes_list(); for (stype = spacetypes->first; stype; stype = stype->next) { diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index 0bb8ede7cca..bfeeb93372a 100644 --- a/source/blender/editors/space_text/CMakeLists.txt +++ b/source/blender/editors/space_text/CMakeLists.txt @@ -59,4 +59,4 @@ if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() -blender_add_lib(bf_editor_text "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_editor_space_text "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index b8c97f8757d..e9a248d123d 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -950,12 +950,12 @@ endif() bf_editor_space_outliner bf_editor_space_script bf_editor_space_sequencer + bf_editor_space_text bf_editor_space_time bf_editor_space_userpref bf_editor_space_view3d bf_editor_space_clip - bf_editor_text bf_editor_transform bf_editor_util bf_editor_uvedit |