diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-07-01 12:53:45 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-07-01 12:53:45 +0400 |
| commit | 61d37cd47c89d57909df4025b85db39685ad220e (patch) | |
| tree | dd16c21042762e98cea128097fd66add71fb3d5b /source/blender/blenkernel/intern/library.c | |
| parent | 0baec4cf2dcaf2b07d9a0b00ccd7bf8288e0347e (diff) | |
Fix for Make Local -> All not working correct with multy-user datablocks
Make Local operator uses BKE_library_make_local function if all the
datablocks needs to be made local. And this function was calling
id_clear_lib_data for every datablock, which only clears library
data. But this function doesn't work correct for datablocks which
areshared by multiple users (this is also mentioned in comment
for this function).
This lead to situations when two datablocks shares the same runtime
data leading to crashes later. For example making everythig local in
scales cycles scene from durian ends up in a crash when toggling
rig edit mode.
Solved by using id_make_local instead of id_clear_lib_data, which
will ensure all the data are nicely expanded and made local.
Checked by Brecht, thanks fr the review!
Diffstat (limited to 'source/blender/blenkernel/intern/library.c')
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index c1715ada7bd..5b5d4f3c318 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1573,7 +1573,7 @@ void BKE_library_make_local(Main *bmain, Library *lib, bool untagged_only) { if (lib == NULL || id->lib == lib) { if (id->lib) { - id_clear_lib_data(bmain, id); /* sets 'id->flag' */ + id_make_local(id, false); /* why sort alphabetically here but not in * id_clear_lib_data() ? - campbell */ |