[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59026] trunk/blender/source/blender/ blenkernel/intern/particle.c: Fix #36274: empty particle texture slots should not have any influence, same

[Brecht Van Lommel]

Revision: 59026
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59026
Author:   blendix
Date:     2013-08-08 18:12:07 +0000 (Thu, 08 Aug 2013)
Log Message:
-----------
Fix #36274: empty particle texture slots should not have any influence, same
as for materials, world, lamps, etc.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c	2013-08-08 17:36:19 UTC (rev 59025)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2013-08-08 18:12:07 UTC (rev 59026)
@@ -3836,7 +3836,7 @@
 
 	for (m = 0; m < MAX_MTEX; m++, mtexp++) {
 		mtex = *mtexp;
-		if (mtex && mtex->mapto) {
+		if (mtex && mtex->tex && mtex->mapto) {
 			float def = mtex->def_var;
 			short blend = mtex->blendtype;
 			short texco = mtex->texco;
@@ -3904,7 +3904,7 @@
 
 	for (m = 0; m < MAX_MTEX; m++, mtexp++) {
 		mtex = *mtexp;
-		if (mtex && mtex->mapto) {
+		if (mtex && mtex->tex && mtex->mapto) {
 			float def = mtex->def_var;
 			short blend = mtex->blendtype;
 			short texco = mtex->texco;