[Bf-blender-cvs] [011061a] asset-experiments: Remove copying of preview data for objects and groups datablocks.

Bastien Montagne noreply at git.blender.org
Fri Jun 19 13:20:16 CEST 2015


Commit: 011061ab5e77c43423283dc40a311945608da1a5
Author: Bastien Montagne
Date:   Fri Jun 19 13:04:04 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB011061ab5e77c43423283dc40a311945608da1a5

Remove copying of preview data for objects and groups datablocks.

Those get temporarily duplicated by renderers (Cycles, Freestyle),
not nice to have useless memory usage here.

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

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

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

diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index b14a71e..ae99ff1 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -155,9 +155,7 @@ Group *BKE_group_copy(Group *group)
 	groupn = BKE_libblock_copy(&group->id);
 	BLI_duplicatelist(&groupn->gobject, &group->gobject);
 
-	if (group->preview) {
-		groupn->preview = BKE_previewimg_copy(group->preview);
-	}
+	/* Do not copy group's preview (same behavior as for objects). */
 
 	if (group->id.lib) {
 		BKE_id_lib_local_paths(G.main, group->id.lib, &groupn->id);
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index e1a33fe..6559989 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1561,9 +1561,7 @@ Object *BKE_object_copy_ex(Main *bmain, Object *ob, bool copy_caches)
 		BKE_id_lib_local_paths(bmain, ob->id.lib, &obn->id);
 	}
 
-	if (ob->preview) {
-		obn->preview = BKE_previewimg_copy(ob->preview);
-	}
+	/* Do not copy object's preview (mostly due to the fact renderers create temp copy of objects). */
 
 	return obn;
 }




More information about the Bf-blender-cvs mailing list