[Bf-blender-cvs] [e954a6b8bc] clay-engine: Fix crash.

Clément Foucault noreply at git.blender.org
Thu Jan 12 12:30:44 CET 2017


Commit: e954a6b8bc3c7b5dca9c61f4d7ac9de2a56b6469
Author: Clément Foucault
Date:   Thu Jan 12 12:29:58 2017 +0100
Branches: clay-engine
https://developer.blender.org/rBe954a6b8bc3c7b5dca9c61f4d7ac9de2a56b6469

Fix crash.

===================================================================

M	source/blender/draw/engines/clay/clay.c

===================================================================

diff --git a/source/blender/draw/engines/clay/clay.c b/source/blender/draw/engines/clay/clay.c
index c0468211ab..44d71474f4 100644
--- a/source/blender/draw/engines/clay/clay.c
+++ b/source/blender/draw/engines/clay/clay.c
@@ -523,14 +523,28 @@ static void clay_view_draw(RenderEngine *UNUSED(engine), const struct bContext *
 void clay_engine_free(void)
 {
 	/* data.depth_sh Is builtin so it's automaticaly freed */
-	if (data.clay_sh) {
+	if (data.clay_sh[WITH_ALL]) {
 		DRW_shader_free(data.clay_sh[WITH_ALL]);
+	}
+	if (data.clay_sh[WITH_HSV_ROT]) {
 		DRW_shader_free(data.clay_sh[WITH_HSV_ROT]);
+	}
+	if (data.clay_sh[WITH_AO_ROT]) {
 		DRW_shader_free(data.clay_sh[WITH_AO_ROT]);
+	}
+	if (data.clay_sh[WITH_AO_HSV]) {
 		DRW_shader_free(data.clay_sh[WITH_AO_HSV]);
+	}
+	if (data.clay_sh[WITH_AO]) {
 		DRW_shader_free(data.clay_sh[WITH_AO]);
+	}
+	if (data.clay_sh[WITH_ROT]) {
 		DRW_shader_free(data.clay_sh[WITH_ROT]);
+	}
+	if (data.clay_sh[WITH_HSV]) {
 		DRW_shader_free(data.clay_sh[WITH_HSV]);
+	}
+	if (data.clay_sh[WITH_NONE]) {
 		DRW_shader_free(data.clay_sh[WITH_NONE]);
 	}




More information about the Bf-blender-cvs mailing list