archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Code cleanup: naming conventions

Browse Source
This commit is contained in:
Campbell Barton
2014-03-16 22:11:14 +11:00
parent 7b7196e3ad
commit 37dd7360d6
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/animation/anim_markers.c
View File

@@ -1494,7 +1494,7 @@ void ED_operatortypes_marker(void)
} }
/* called in screen_ops.c:ED_keymap_screen() */ /* 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); wmKeyMap *keymap = WM_keymap_find(keyconf, "Markers", 0, 0);
wmKeyMapItem *kmi; wmKeyMapItem *kmi;

2
source/blender/editors/include/ED_markers.h
View File

@@ -69,7 +69,7 @@ struct TimeMarker *ED_markers_get_first_selected(ListBase *markers);
/* called in screen_ops.c:ED_operatortypes_screen() */ /* called in screen_ops.c:ED_operatortypes_screen() */
void ED_operatortypes_marker(void); void ED_operatortypes_marker(void);
/* called in screen_ops.c:ED_keymap_screen() */ /* 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 */ /* called in animation editors - keymap defines */
void ED_marker_keymap_animedit_conflictfree(struct wmKeyMap *keymap); void ED_marker_keymap_animedit_conflictfree(struct wmKeyMap *keymap);

4
source/blender/editors/include/UI_view2d.h
View File

@@ -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); void UI_view2d_text_cache_draw(struct ARegion *ar);
/* operators */ /* operators */
void UI_view2d_operatortypes(void); void ED_operatortypes_view2d(void);
void UI_view2d_keymap(struct wmKeyConfig *keyconf); void ED_keymap_view2d(struct wmKeyConfig *keyconf);
void UI_view2d_smooth_view(struct bContext *C, struct ARegion *ar, void UI_view2d_smooth_view(struct bContext *C, struct ARegion *ar,
const struct rctf *cur, const int smooth_viewtx); const struct rctf *cur, const int smooth_viewtx);

4
source/blender/editors/interface/view2d_ops.c
View File

@@ -1992,7 +1992,7 @@ static void VIEW2D_OT_reset(wmOperatorType *ot)
/* ********************************************************* */ /* ********************************************************* */
/* Registration */ /* Registration */
void UI_view2d_operatortypes(void) void ED_operatortypes_view2d(void)
{ {
WM_operatortype_append(VIEW2D_OT_pan); WM_operatortype_append(VIEW2D_OT_pan);
@@ -2016,7 +2016,7 @@ void UI_view2d_operatortypes(void)
WM_operatortype_append(VIEW2D_OT_reset); 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); wmKeyMap *keymap = WM_keymap_find(keyconf, "View2D", 0, 0);
wmKeyMapItem *kmi; wmKeyMapItem *kmi;

6
source/blender/editors/space_api/spacetypes.c
View File

@@ -119,7 +119,7 @@ void ED_spacetypes_init(void)
ED_operatortypes_mask(); ED_operatortypes_mask();
ED_operatortypes_io(); ED_operatortypes_io();
UI_view2d_operatortypes(); ED_operatortypes_view2d();
UI_buttons_operatortypes(); UI_buttons_operatortypes();
/* register operators */ /* register operators */
@@ -177,9 +177,9 @@ void ED_spacetypes_keymap(wmKeyConfig *keyconf)
ED_keymap_metaball(keyconf); ED_keymap_metaball(keyconf);
ED_keymap_paint(keyconf); ED_keymap_paint(keyconf);
ED_keymap_mask(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(); spacetypes = BKE_spacetypes_list();
for (stype = spacetypes->first; stype; stype = stype->next) { for (stype = spacetypes->first; stype; stype = stype->next) {

2
source/blender/editors/space_text/CMakeLists.txt
View File

@@ -59,4 +59,4 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL)
endif() endif()
blender_add_lib(bf_editor_text "${SRC}" "${INC}" "${INC_SYS}") blender_add_lib(bf_editor_space_text "${SRC}" "${INC}" "${INC_SYS}")

2
source/creator/CMakeLists.txt
View File

@@ -950,12 +950,12 @@ endif()
bf_editor_space_outliner bf_editor_space_outliner
bf_editor_space_script bf_editor_space_script
bf_editor_space_sequencer bf_editor_space_sequencer
bf_editor_space_text
bf_editor_space_time bf_editor_space_time
bf_editor_space_userpref bf_editor_space_userpref
bf_editor_space_view3d bf_editor_space_view3d
bf_editor_space_clip bf_editor_space_clip
bf_editor_text
bf_editor_transform bf_editor_transform
bf_editor_util bf_editor_util
bf_editor_uvedit bf_editor_uvedit