[Bf-blender-cvs] [8bb7a33] master: Minor fix/cleanup to object's make_local.

Bastien Montagne noreply at git.blender.org
Sat Jul 9 15:44:51 CEST 2016


Commit: 8bb7a339f76549b4820a670450c0799713d650f8
Author: Bastien Montagne
Date:   Sat Jul 9 14:43:57 2016 +0200
Branches: master
https://developer.blender.org/rB8bb7a339f76549b4820a670450c0799713d650f8

Minor fix/cleanup to object's make_local.

===================================================================

M	source/blender/blenkernel/intern/object.c

===================================================================

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 300dc73..e95e860 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 {




More information about the Bf-blender-cvs mailing list