[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55739] trunk/blender/source/blender/ editors/space_buttons/buttons_texture.c: Fix #34759: cycles texture influence for particles not shown correct when switching

[Brecht Van Lommel]

Revision: 55739
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55739
Author:   blendix
Date:     2013-04-02 18:19:37 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
Fix #34759: cycles texture influence for particles not shown correct when switching
to a different texture slot.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_buttons/buttons_texture.c

Modified: trunk/blender/source/blender/editors/space_buttons/buttons_texture.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_texture.c	2013-04-02 18:19:35 UTC (rev 55738)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_texture.c	2013-04-02 18:19:37 UTC (rev 55739)
@@ -205,7 +205,6 @@
 
 		/* particle systems */
 		if (psys) {
-			/* todo: these slots are not in the UI */
 			for (a = 0; a < MAX_MTEX; a++) {
 				mtex = psys->part->mtex[a];
 
@@ -333,6 +332,17 @@
 		tex = (RNA_struct_is_a(texptr.type, &RNA_Texture)) ? texptr.data : NULL;
 
 		ct->texture = tex;
+
+		if(user->ptr.type == &RNA_ParticleSettingsTextureSlot) {
+			/* stupid exception for particle systems which still uses influence
+			 * from the old texture system, set the active texture slots as well */
+			ParticleSettings *part = user->ptr.id.data;
+			int a;
+
+			for(a = 0; a < MAX_MTEX; a++)
+				if(user->ptr.data == part->mtex[a])
+					part->texact = a;
+		}
 	}
 
 	ct->user = user;