Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJanne Karhu <jhkarh@gmail.com>2011-03-30 01:00:42 +0400
committerJanne Karhu <jhkarh@gmail.com>2011-03-30 01:00:42 +0400
commit31700740111073c05dbec457d6b205fe53772aac (patch)
tree360a675fa77f9113af8f58b2f8f8393c4c06efad /source
parent952aa9804f0edb1e96d363f6dfb3349310a88e93 (diff)
Fix for [#26646] Hair particle density texture prevents strand render on linked assets
* Linked particle textures weren't expanded during file load.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenloader/intern/readfile.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index e3b736bb7e8..a304084c7b2 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -12032,6 +12032,8 @@ static void expand_animdata(FileData *fd, Main *mainvar, AnimData *adt)
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 @@ static void expand_particlesettings(FileData *fd, Main *mainvar, ParticleSetting
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)