[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35885] trunk/blender/source/blender/ blenloader/intern/readfile.c: Fix for [#26646] Hair particle density texture prevents strand render on linked assets

[Janne Karhu]

Revision: 35885
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35885
Author:   jhk
Date:     2011-03-29 21:00:42 +0000 (Tue, 29 Mar 2011)
Log Message:
-----------
Fix for [#26646] Hair particle density texture prevents strand render on linked assets
* Linked particle textures weren't expanded during file load.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-03-29 18:44:18 UTC (rev 35884)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-03-29 21:00:42 UTC (rev 35885)
@@ -12032,6 +12032,8 @@
 
 static void expand_particlesettings(FileData *fd, Main *mainvar, ParticleSettings *part)
 {
+	int a;
+
 	expand_doit(fd, mainvar, part->dup_ob);
 	expand_doit(fd, mainvar, part->dup_group);
 	expand_doit(fd, mainvar, part->eff_group);
@@ -12039,6 +12041,13 @@
 	
 	if(part->adt)
 		expand_animdata(fd, mainvar, part->adt);
+
+	for(a=0; a<MAX_MTEX; a++) {
+		if(part->mtex[a]) {
+			expand_doit(fd, mainvar, part->mtex[a]->tex);
+			expand_doit(fd, mainvar, part->mtex[a]->object);
+		}
+	}
 }
 
 static void expand_group(FileData *fd, Main *mainvar, Group *group)