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

Cleanup: naming for callback wrappers

Browse Source
This commit is contained in:
Campbell Barton
2015-05-04 12:29:38 +10:00
parent 8515be8a73
commit da8a62adce
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_blender.h
View File

@@ -87,7 +87,7 @@ void BKE_userdef_free(void);
void BKE_userdef_state(void);
/* set this callback when a UI is running */
void set_blender_test_break_cb(void (*func)(void));
void BKE_blender_callback_test_break_set(void (*func)(void));
int blender_test_break(void);
#define BKE_UNDO_STR_MAX 64

4
source/blender/blenkernel/BKE_library.h
View File

@@ -107,8 +107,8 @@ void BKE_library_make_local(struct Main *bmain, struct Library *lib, bool untagg
struct ID *BKE_libblock_find_name_ex(struct Main *bmain, const short type, const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
struct ID *BKE_libblock_find_name(const short type, const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
void set_free_windowmanager_cb(void (*func)(struct bContext *, struct wmWindowManager *));
void set_free_notifier_reference_cb(void (*func)(const void *));
void BKE_library_callback_free_window_manager_set(void (*func)(struct bContext *, struct wmWindowManager *));
void BKE_library_callback_free_notifier_reference_set(void (*func)(const void *));
/* use when "" is given to new_id() */
#define ID_FALLBACK_NAME N_("Untitled")

2
source/blender/blenkernel/intern/blender.c
View File

@@ -623,7 +623,7 @@ int BKE_write_file_userdef(const char *filepath, ReportList *reports)
static void (*blender_test_break_cb)(void) = NULL;
void set_blender_test_break_cb(void (*func)(void))
void BKE_blender_callback_test_break_set(void (*func)(void))
{
blender_test_break_cb = func;
}

4
source/blender/blenkernel/intern/library.c
View File

@@ -865,14 +865,14 @@ static void BKE_library_free(Library *lib)
static void (*free_windowmanager_cb)(bContext *, wmWindowManager *) = NULL;
void set_free_windowmanager_cb(void (*func)(bContext *C, wmWindowManager *) )
void BKE_library_callback_free_window_manager_set(void (*func)(bContext *C, wmWindowManager *) )
{
free_windowmanager_cb = func;
}
static void (*free_notifier_reference_cb)(const void *) = NULL;
void set_free_notifier_reference_cb(void (*func)(const void *) )
void BKE_library_callback_free_notifier_reference_set(void (*func)(const void *) )
{
free_notifier_reference_cb = func;
}

6
source/blender/windowmanager/intern/wm_init_exit.c
View File

@@ -149,9 +149,9 @@ void WM_init(bContext *C, int argc, const char **argv)
WM_menutype_init();
WM_uilisttype_init();
set_free_windowmanager_cb(wm_close_and_free); /* library.c */
set_free_notifier_reference_cb(WM_main_remove_notifier_reference); /* library.c */
set_blender_test_break_cb(wm_window_testbreak); /* blender.c */
BKE_library_callback_free_window_manager_set(wm_close_and_free); /* library.c */
BKE_library_callback_free_notifier_reference_set(WM_main_remove_notifier_reference); /* library.c */
BKE_blender_callback_test_break_set(wm_window_testbreak); /* blender.c */
DAG_editors_update_cb(ED_render_id_flush_update, ED_render_scene_update); /* depsgraph.c */
ED_spacetypes_init(); /* editors/space_api/spacetype.c */