From 6510367c3864723449f9ce1022a55a5e60d7aef9 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 24 Jan 2013 08:49:48 +0000 Subject: Fix #33975: Crash when reloading texture Two issues in texture_changed: - Missing NULL check for material (slot could be empty) - Materials could be linked to object, added special check for this --- source/blender/editors/render/render_update.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/render') diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c index 38535eca918..16d7923baff 100644 --- a/source/blender/editors/render/render_update.c +++ b/source/blender/editors/render/render_update.c @@ -394,7 +394,14 @@ static void texture_changed(Main *bmain, Tex *tex) if (dm && totmaterial && material) { for (a = 0; a < *totmaterial; a++) { - if (material_uses_texture((*material)[a], tex)) { + Material *ma; + + if (ob->matbits && ob->matbits[a]) + ma = ob->mat[a]; + else + ma = (*material)[a]; + + if (ma && material_uses_texture(ma, tex)) { GPU_drawobject_free(dm); break; } -- cgit v1.2.3