[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13101] trunk/blender/source/blender: displace modifier wasnt loading in linked textures/objects.

[Campbell Barton]

Revision: 13101
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13101
Author:   campbellbarton
Date:     2008-01-02 19:44:13 +0100 (Wed, 02 Jan 2008)

Log Message:
-----------
displace modifier wasnt loading in linked textures/objects. missing calls to expand_doit

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

Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c	2008-01-02 17:57:18 UTC (rev 13100)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c	2008-01-02 18:44:13 UTC (rev 13101)
@@ -2724,7 +2724,7 @@
 {
 	DisplaceModifierData *dmd = (DisplaceModifierData*) md;
 
-	walk(userData, ob, (ID **)&dmd->texture);
+	walk(userData, ob, &dmd->texture);
 
 	displaceModifier_foreachObjectLink(md, ob, (ObjectWalkFunc) walk, userData);
 }

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2008-01-02 17:57:18 UTC (rev 13100)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2008-01-02 18:44:13 UTC (rev 13101)
@@ -7867,6 +7867,12 @@
 			
 		expand_doit(fd, mainvar, mmd->mirror_ob);
 	}
+	else if (md->type==eModifierType_Displace) {
+		DisplaceModifierData *dmd = (DisplaceModifierData*) md;
+		
+		expand_doit(fd, mainvar, dmd->map_object);
+		expand_doit(fd, mainvar, dmd->texture);
+	}
 }
 
 static void expand_scriptlink(FileData *fd, Main *mainvar, ScriptLink *slink)