diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-01-30 18:40:42 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-01-30 18:40:42 +0300 |
| commit | fa2a1c84c77486ad0813796019dd6455e856ee2c (patch) | |
| tree | a5043679f6a358f7a3d7a51809d8cf5ab5dfc90c /source/blender/blenloader | |
| parent | c94ec03a9e894227b71fac6c99385f5324e32505 (diff) | |
Bug fixes;
#2187: Append to active layer now uses the real active layer
#2191: Stars didnt show up correctly in envmap render
#2194: Startfame > Endframe in anim render crashed (now it gives error)
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index ad4b36f3b0b..af04a701ccc 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5314,8 +5314,12 @@ static void append_named_part(FileData *fd, Main *mainvar, Scene *scene, char *n if(id==0) ob= mainvar->object.last; else ob= (Object *)id; - - if((flag & FILE_ACTIVELAY)) ob->lay = G.scene->lay; + + /* this is bad code... G.vd nor G.scene should be used on this level... */ + if((flag & FILE_ACTIVELAY)) { + if(G.vd) ob->lay= G.vd->layact; + else ob->lay = G.scene->lay; + } base->lay= ob->lay; base->object= ob; ob->id.us++; |