tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Depsgraph: Remove old depsgraph header from window manager

This commit is contained in:
Sergey Sharybin 2017-04-06 16:44:32 +02:00
parent ec178b861c
commit 035b340f48
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/windowmanager/CMakeLists.txt
View File

@ -33,6 +33,7 @@ set(INC
../blenloader
../blentranslation
../compositor
../depsgraph
../editors/include
../gpu
../imbuf

5
source/blender/windowmanager/intern/wm_files.c
View File

@ -77,7 +77,6 @@
#include "BKE_blendfile.h"
#include "BKE_blender_undo.h"
#include "BKE_context.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h"
#include "BKE_library.h"
#include "BKE_main.h"
@ -119,6 +118,8 @@
#include "BPY_extern.h"
#endif
#include "DEG_depsgraph.h"
#include "WM_api.h"
#include "WM_types.h"
#include "wm.h"
@ -464,7 +465,7 @@ static void wm_file_read_post(bContext *C, bool is_startup_file)
CTX_wm_window_set(C, wm->windows.first);
ED_editors_init(C);
DAG_on_visible_update(CTX_data_main(C), true);
DEG_on_visible_update(CTX_data_main(C), true);
#ifdef WITH_PYTHON
if (is_startup_file) {

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

@ -59,7 +59,6 @@
#include "BLO_readfile.h"
#include "BKE_context.h"
#include "BKE_depsgraph.h"
#include "BKE_library.h"
#include "BKE_library_remap.h"
#include "BKE_global.h"
@ -69,6 +68,7 @@
#include "BKE_idcode.h"
#include "DEG_depsgraph_build.h"
#include "IMB_colormanagement.h"
@ -446,7 +446,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op)
BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, false);
/* recreate dependency graph to include new objects */
DAG_scene_relations_rebuild(bmain, scene);
DEG_scene_relations_rebuild(bmain, scene);
/* free gpu materials, some materials depend on existing objects, such as lamps so freeing correctly refreshes */
GPU_materials_free();
@ -736,7 +736,7 @@ static void lib_relocate_do(
BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, false);
/* recreate dependency graph to include new objects */
DAG_scene_relations_rebuild(bmain, scene);
DEG_scene_relations_rebuild(bmain, scene);
/* free gpu materials, some materials depend on existing objects, such as lamps so freeing correctly refreshes */
GPU_materials_free();

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

@ -119,10 +119,11 @@
#include "GPU_draw.h"
#include "GPU_init_exit.h"
#include "BKE_depsgraph.h"
#include "BKE_sound.h"
#include "COM_compositor.h"
#include "DEG_depsgraph.h"
#ifdef WITH_OPENSUBDIV
# include "BKE_subsurf.h"
#endif
@ -173,9 +174,9 @@ void WM_init(bContext *C, int argc, const char **argv)
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_remap_set(ED_spacedata_id_remap); /* screen.c */
DAG_editors_update_cb(ED_render_id_flush_update,
ED_render_scene_update,
ED_render_scene_update_pre); /* depsgraph.c */
DEG_editors_set_update_cb(ED_render_id_flush_update,
ED_render_scene_update,
ED_render_scene_update_pre);
ED_spacetypes_init(); /* editors/space_api/spacetype.c */

5
source/blender/windowmanager/intern/wm_playanim.c
View File

@ -58,7 +58,6 @@
#include "IMB_imbuf_types.h"
#include "IMB_imbuf.h"
#include "BKE_depsgraph.h"
#include "BKE_image.h"
#include "BIF_gl.h"
@ -72,6 +71,8 @@
#include "GHOST_C-api.h"
#include "BLF_api.h"
#include "DEG_depsgraph.h"
#include "WM_api.h" /* only for WM_main_playanim */
#ifdef WITH_AUDASPACE
@ -1545,7 +1546,7 @@ static char *wm_main_playanim_intern(int argc, const char **argv)
IMB_exit();
BKE_images_exit();
DAG_exit();
DEG_free_node_types();
totblock = MEM_get_memory_blocks_in_use();
if (totblock != 0) {