[Bf-blender-cvs] [52c46ceede6] workspaces: Fix unfreed IDProperties, caused by branch merges

Julian Eisel noreply at git.blender.org
Fri May 5 21:48:49 CEST 2017


Commit: 52c46ceede6c8454e4a40cf69fd22a663ef7d612
Author: Julian Eisel
Date:   Fri May 5 21:42:22 2017 +0200
Branches: workspaces
https://developer.blender.org/rB52c46ceede6c8454e4a40cf69fd22a663ef7d612

Fix unfreed IDProperties, caused by branch merges

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

M	source/blender/blenloader/intern/versioning_280.c

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

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 964394c39d1..79b2d8062d7 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -286,12 +286,6 @@ void do_versions_after_linking_280(Main *main)
 	}
 
 	if (!MAIN_VERSION_ATLEAST(main, 280, 0)) {
-		IDPropertyTemplate val = {0};
-		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
-			scene->collection_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP);
-			BKE_layer_collection_engine_settings_create(scene->collection_properties);
-		}
-
 		for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) {
 			for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 				for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {




More information about the Bf-blender-cvs mailing list