Commit: 77848f23a49235b031b6d2d5b71654d12b7e66ad
Author: Antony Riakiotakis
Date: Tue Jan 27 15:37:49 2015 +0100
Branches: master
https://developer.blender.org/rB77848f23a49235b031b6d2d5b71654d12b7e66ad
Fix T43371 lamps not updated on appenidng. Remove GPU materials on
appeniding.
===================================================================
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_operators.c
b/source/blender/windowmanager/intern/wm_operators.c
index 000f9f1..3097ad4 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -102,6 +102,8 @@
#include "ED_util.h"
#include "ED_view3d.h"
+#include "GPU_material.h"
+
#include "RNA_access.h"
#include "RNA_define.h"
#include "RNA_enum_types.h"
@@ -2682,7 +2684,9 @@ static int wm_link_append_exec(bContext *C, wmOperator
*op)
/* recreate dependency graph to include new objects */
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();
BLO_blendhandle_close(bh);
/* XXX TODO: align G.lib with other directory storage (like last opened
image etc...) */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
