[Bf-blender-cvs] [07d571ea22] render-layers: Remove Bases onces and for all

Dalai Felinto noreply at git.blender.org
Thu Jan 12 18:25:36 CET 2017


Commit: 07d571ea220d2cfe54453c2df43c548ed4297f40
Author: Dalai Felinto
Date:   Thu Jan 12 18:22:56 2017 +0100
Branches: render-layers
https://developer.blender.org/rB07d571ea220d2cfe54453c2df43c548ed4297f40

Remove Bases onces and for all

This officially makes the viewport not draw anything, until we get the
new ObjectBase * to use.

This is easily revertable, but for now I prefer to make sure this is not
in the way of refactoring.

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

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 24714cfce9..2e8b25359b 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -144,6 +144,13 @@ void blo_do_versions_after_linking_280(Main *main)
 						BKE_collection_remove(scene, collections[i]);
 					}
 				}
+
+				/* remove bases once and for all */
+				for (Base *base = scene->base.first; base; base = base->next) {
+					id_us_min(&base->object->id);
+				}
+				BLI_freelistN(&scene->base);
+				scene->basact = NULL;
 			}
 		}
 	}




More information about the Bf-blender-cvs mailing list