diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-25 13:32:48 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-25 13:32:48 +0300 |
| commit | 8a7f317666caa41aad0428b5ed3f399cdfbbd816 (patch) | |
| tree | 7e6ba6c6a1ab952cc175d4e08b39aebc2286cb4a /source/blender/windowmanager/intern/wm_files_link.c | |
| parent | f33cb522dd5793c685dcd681f7c7e13ff60f920a (diff) | |
Cleanup: Nuke most of G.main from GPU code.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_files_link.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files_link.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index 5a92a345117..8e11e548aec 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -455,7 +455,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op) } /* free gpu materials, some materials depend on existing objects, such as lamps so freeing correctly refreshes */ - GPU_materials_free(); + GPU_materials_free(bmain); /* XXX TODO: align G.lib with other directory storage (like last opened image etc...) */ BLI_strncpy(G.lib, root, FILE_MAX); @@ -751,7 +751,7 @@ static void lib_relocate_do( DAG_scene_relations_rebuild(bmain, scene); /* free gpu materials, some materials depend on existing objects, such as lamps so freeing correctly refreshes */ - GPU_materials_free(); + GPU_materials_free(bmain); } void WM_lib_reload(Library *lib, bContext *C, ReportList *reports) |