diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-09 16:08:24 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-09 16:44:12 +0300 |
| commit | 11f64f494b715498e4cbc147ae6a9d10538dc055 (patch) | |
| tree | 9d7e7f9dfdce67c5ab285315e67736b56762faa7 /source/blender/blenkernel/intern/mesh.c | |
| parent | 9044ccec5f811fd380fc0348d91d1c53729eea22 (diff) | |
Refactor/enhance BKE_curve_make_local(), and add BKE_curve_copy_ex() that takes a Main as parameter.
Now using modern features from libquery/libremap areas.
Provides same kind of fixes/improvements as for BKE_object_make_local() (see rBd1a4ae3f395a6).
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 82667484f1c..de9be3d835d 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -589,7 +589,7 @@ static int extern_local_mesh_callback( if ((cd_flag & IDWALK_USER) && *id_pointer) { id_lib_extern(*id_pointer); } - return IDWALK_NOP; + return IDWALK_RET_NOP; } static void expand_local_mesh(Mesh *me) @@ -2338,7 +2338,7 @@ Mesh *BKE_mesh_new_from_object( BKE_object_free_modifiers(tmpobj); /* copies the data */ - copycu = tmpobj->data = BKE_curve_copy((Curve *) ob->data); + copycu = tmpobj->data = BKE_curve_copy_ex(bmain, (Curve *) ob->data); /* temporarily set edit so we get updates from edit mode, but * also because for text datablocks copying it while in edit |