[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54069] trunk/blender/source/blender/ editors/render/render_update.c: Fix #33975: Crash when reloading texture

[Sergey Sharybin]

Revision: 54069
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54069
Author:   nazgul
Date:     2013-01-24 08:49:48 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
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

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_update.c

Modified: trunk/blender/source/blender/editors/render/render_update.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_update.c	2013-01-24 08:49:40 UTC (rev 54068)
+++ trunk/blender/source/blender/editors/render/render_update.c	2013-01-24 08:49:48 UTC (rev 54069)
@@ -394,7 +394,14 @@
 
 			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;
 					}