diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-09-29 16:22:50 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-09-29 16:25:50 +0400 |
| commit | 2842b0e9c99a5fda85231b44de5f1f17d0e402f2 (patch) | |
| tree | 1089310e2e24622559e59afd83726ac5a04e6654 /source/blender/blenloader/intern | |
| parent | b4efe251196b2bfa7334878bace6049b7700a81d (diff) | |
Revert previous commit (sorry about that), and use standard func to get active layer
in this case too.
Thanks to Campbell for the head up.
Diffstat (limited to 'source/blender/blenloader/intern')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 3833846496d..7aadf4a51ea 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -8996,10 +8996,10 @@ static ID *append_named_part_ex(const bContext *C, Main *mainl, FileData *fd, co ob = (Object *)id; - /* link at active layer (view3d->lay if in context, else scene->lay */ + /* link at active layer (view3d if available in context, else scene one */ if ((flag & FILE_ACTIVELAY)) { View3D *v3d = CTX_wm_view3d(C); - ob->lay = v3d ? v3d->lay : scene->lay; + ob->lay = BKE_screen_view3d_layer_active(v3d, scene); } ob->mode = OB_MODE_OBJECT; |