diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-24 18:43:08 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-24 21:35:17 +0400 |
| commit | 04648767fabda7d9461e32c89afcd806d0227547 (patch) | |
| tree | e7297fca0b6d623892b9a08aea9bbb0b4bb025b0 /source/blender/blenkernel/intern/mesh.c | |
| parent | fc1040cc47594e2a68d120cf08c0c3c70fbc44d1 (diff) | |
Make main library safe(er) for the threaded usage
Added a lock to the Main which is getting acquired and released
when modifying it's lists.
Should not be any functional changes now, it just means Main is
now considered safe without worrying about locks in the callee.
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 7197d560bcc..7c6164a8174 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -2148,7 +2148,7 @@ Mesh *BKE_mesh_new_from_object( * if it didn't the curve did not have any segments or otherwise * would have generated an empty mesh */ if (tmpobj->type != OB_MESH) { - BKE_libblock_free_us(G.main, tmpobj); + BKE_libblock_free_us(bmain, tmpobj); return NULL; } |