Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-07-20 17:15:13 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-07-20 17:15:13 +0300
commit57ee488404a85287cecf8dd09349b961e7f068ee (patch)
tree7bee351ecd81416c2c1b33aa83eb8edcc49f7a4d /source/blender/editors/render
parent21f27692daece6b6aea2887bc99d4b67d7764935 (diff)
Partially revert previous commit, some unwanted changes sneaked in
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r--source/blender/editors/render/render_update.c4
1 files changed, 4 insertions, 0 deletions
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)) {