Commit: 62ff31971a7115a9721867ff06a05e5abb57a732
Author: Bastien Montagne
Date: Sun Aug 30 12:06:02 2015 +0200
Branches: id-remap
https://developer.blender.org/rB62ff31971a7115a9721867ff06a05e5abb57a732
Merge branch 'master' into id-remap
===================================================================
===================================================================
diff --cc source/blender/windowmanager/intern/wm_init_exit.c
index 1c0acc5,724c779..f4c2a4e
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@@ -156,10 -156,12 +156,12 @@@ void WM_init(bContext *C, int argc, con
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_library_callback_free_editor_id_reference_set(WM_main_remove_editor_id_reference);
/* library.c */
+
BKE_library_callback_remap_editor_id_reference_set(WM_main_remap_editor_id_reference);
/* library.c */
BKE_blender_callback_test_break_set(wm_window_testbreak); /* blender.c
*/
- BKE_spacedata_callback_id_unref_set(ED_spacedata_id_unref); /* screen.c
*/
+ BKE_spacedata_callback_id_remap_set(ED_spacedata_id_remap); /* screen.c
*/
- DAG_editors_update_cb(ED_render_id_flush_update,
ED_render_scene_update); /* depsgraph.c */
+ DAG_editors_update_cb(ED_render_id_flush_update,
+ ED_render_scene_update,
+ ED_render_scene_update_pre); /* depsgraph.c */
ED_spacetypes_init(); /* editors/space_api/spacetype.c */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
