[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44592] trunk/blender/source/blender/ render/intern/source/render_texture.c: Fix #30413: dynamic paint crash with texture slots with no texture assigned.

[Brecht Van Lommel]

Revision: 44592
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44592
Author:   blendix
Date:     2012-03-01 20:41:13 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
Fix #30413: dynamic paint crash with texture slots with no texture assigned.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/render_texture.c

Modified: trunk/blender/source/blender/render/intern/source/render_texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/render_texture.c	2012-03-01 20:31:57 UTC (rev 44591)
+++ trunk/blender/source/blender/render/intern/source/render_texture.c	2012-03-01 20:41:13 UTC (rev 44592)
@@ -3556,6 +3556,8 @@
 		if(mat->mtex[tex_nr]) {
 			MTex *mtex = mat->mtex[tex_nr];
 
+			if(!mtex->tex) continue;
+
 			/* only keep compatible texflags */
 			mtex->texflag = mtex->texflag & (MTEX_RGBTOINT | MTEX_STENCIL | MTEX_NEGATIVE | MTEX_ALPHAMIX);
 
@@ -3629,9 +3631,12 @@
 		if(mat->septex & (1<<tex_nr)) continue;
 		if(mat->mtex[tex_nr]) {
 			MTex *mtex= mat->mtex[tex_nr];
-			free_texture(mtex->tex);
-			MEM_freeN(mtex->tex);
-			mtex->tex = NULL;
+	
+			if(mtex->tex) {
+				free_texture(mtex->tex);
+				MEM_freeN(mtex->tex);
+				mtex->tex = NULL;
+			}
 		}
 	}