diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2022-08-01 17:29:52 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2022-08-01 17:29:52 +0300 |
| commit | be0449cfcae25ff64540e3859232481826f675fb (patch) | |
| tree | 80f663b543f27c97e39f6265ea119abc512b6c6a /source/blender/blenkernel/intern/scene.cc | |
| parent | 49bccd7740622d287f82e4c9b73bfc81d9a22584 (diff) | |
| parent | 3393b7137e247383477eb38d938239fbb9221680 (diff) | |
Merge branch 'master' into sculpt_curve_collisionssculpt_curve_collisions
Diffstat (limited to 'source/blender/blenkernel/intern/scene.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index e2da27fc840..aaa6baac1ff 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/source/blender/blenkernel/intern/scene.cc @@ -1481,7 +1481,7 @@ static void scene_blend_read_lib(BlendLibReader *reader, ID *id) } LISTBASE_FOREACH (TimeMarker *, marker, &sce->markers) { - IDP_BlendReadLib(reader, marker->prop); + IDP_BlendReadLib(reader, sce->id.lib, marker->prop); if (marker->camera) { BLO_read_id_address(reader, sce->id.lib, &marker->camera); |