[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34818] trunk/blender/source/blender/ blenkernel/intern/texture.c: Fix for [#26053] Blender Crash with Particules Textures

Janne Karhu jhkarh at gmail.com
Sun Feb 13 12:45:05 CET 2011


Revision: 34818
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34818
Author:   jhk
Date:     2011-02-13 11:45:04 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
Fix for [#26053] Blender Crash with Particules Textures
* Particle textures weren't handled properly on texture slot move operations.

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

Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/texture.c	2011-02-13 11:32:47 UTC (rev 34817)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c	2011-02-13 11:45:04 UTC (rev 34818)
@@ -1051,6 +1051,10 @@
 		*mtex_ar=		((Lamp *)id)->mtex;
 		if(act) *act=	(((Lamp *)id)->texact);
 		break;
+	case ID_PA:
+		*mtex_ar=		((ParticleSettings *)id)->mtex;
+		if(act) *act=	(((ParticleSettings *)id)->texact);
+		break;
 	default:
 		*mtex_ar = NULL;
 		if(act) *act=	0;




More information about the Bf-blender-cvs mailing list