Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2016-07-09 15:43:57 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-07-09 16:44:12 +0300
commit8bb7a339f76549b4820a670450c0799713d650f8 (patch)
treeb78b26347c06bda301e68882f2830d9de3723687 /source/blender/blenkernel/intern/object.c
parent1b45c52734a8320322c120c7580080e6fbbc4da6 (diff)
Minor fix/cleanup to object's make_local.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
-rw-r--r--source/blender/blenkernel/intern/object.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 300dc73a24c..e95e860e18b 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1199,8 +1199,6 @@ static int extern_local_object_callback(
static void extern_local_object(Object *ob)
{
BKE_library_foreach_ID_link(&ob->id, extern_local_object_callback, NULL, 0);
-
- ob->preview = NULL;
}
void BKE_object_make_local(Main *bmain, Object *ob)
@@ -1220,8 +1218,8 @@ void BKE_object_make_local(Main *bmain, Object *ob)
if (is_local) {
if (!is_lib) {
- ob->proxy = ob->proxy_from = ob->proxy_group = NULL;
id_clear_lib_data(bmain, &ob->id);
+ ob->preview = NULL;
extern_local_object(ob);
}
else {