[Bf-blender-cvs] [57ee488404a] blender2.8: Partially revert previous commit, some unwanted changes sneaked in
Sergey Sharybin
noreply at git.blender.org
Thu Jul 20 16:15:30 CEST 2017
Commit: 57ee488404a85287cecf8dd09349b961e7f068ee
Author: Sergey Sharybin
Date: Thu Jul 20 16:15:13 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB57ee488404a85287cecf8dd09349b961e7f068ee
Partially revert previous commit, some unwanted changes sneaked in
===================================================================
M source/blender/editors/render/render_update.c
===================================================================
diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c
index 5d4015f64bd..42d914b1a71 100644
--- a/source/blender/editors/render/render_update.c
+++ b/source/blender/editors/render/render_update.c
@@ -298,6 +298,10 @@ static void material_changed(Main *bmain, Material *ma)
/* icons */
BKE_icon_changed(BKE_icon_id_ensure(&ma->id));
+ /* glsl */
+ if (ma->gpumaterial.first)
+ GPU_material_free(&ma->gpumaterial);
+
/* find node materials using this */
for (parent = bmain->mat.first; parent; parent = parent->id.next) {
if (parent->use_nodes && parent->nodetree && nodes_use_material(parent->nodetree, ma)) {
More information about the Bf-blender-cvs
mailing list