[Bf-blender-cvs] [ee6214d] render-layers: Merge remote-tracking branch 'origin/blender2.8' into render-layers
Dalai Felinto
noreply at git.blender.org
Fri Dec 23 15:59:44 CET 2016
Commit: ee6214dc804f05cbd0a45864bf283886dcf0efa3
Author: Dalai Felinto
Date: Fri Dec 23 15:56:13 2016 +0100
Branches: render-layers
https://developer.blender.org/rBee6214dc804f05cbd0a45864bf283886dcf0efa3
Merge remote-tracking branch 'origin/blender2.8' into render-layers
Include manual changes to accomodate new do_versions_after_liblink
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/readfile.c
index bd0ef05,69fc85b..d2288e2
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -8045,9 -7982,10 +8054,11 @@@ static void do_versions(FileData *fd, L
/* don't forget to set version number in BKE_blender_version.h! */
}
- static void do_versions_after_linking(FileData *fd, Library *lib, Main *main)
+ static void do_versions_after_linking(Main *main)
{
- blo_do_versions_after_linking_280(fd, lib, main);
+ // printf("%s for %s (%s), %d.%d\n", __func__, main->curlib ? main->curlib->name : main->name,
+ // main->curlib ? "LIB" : "MAIN", main->versionfile, main->subversionfile);
++ blo_do_versions_after_linking_280(main);
}
static void lib_link_all(FileData *fd, Main *main)
diff --cc source/blender/blenloader/intern/readfile.h
index daa49d0,7719aaa..d6203a8
--- a/source/blender/blenloader/intern/readfile.h
+++ b/source/blender/blenloader/intern/readfile.h
@@@ -171,8 -169,6 +171,8 @@@ void blo_do_versions_pre250(struct File
void blo_do_versions_250(struct FileData *fd, struct Library *lib, struct Main *main);
void blo_do_versions_260(struct FileData *fd, struct Library *lib, struct Main *main);
void blo_do_versions_270(struct FileData *fd, struct Library *lib, struct Main *main);
+void blo_do_versions_280(struct FileData *fd, struct Library *lib, struct Main *main);
- void blo_do_versions_after_linking_280(struct FileData *fd, struct Library *lib, struct Main *main);
++void blo_do_versions_after_linking_280(struct Main *main);
#endif
diff --cc source/blender/blenloader/intern/versioning_280.c
index 1835801,0000000..8059aab
mode 100644,000000..100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -1,146 -1,0 +1,147 @@@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Dalai Felinto
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ *
+ */
+
+/** \file blender/blenloader/intern/versioning_280.c
+ * \ingroup blenloader
+ */
+
+/* allow readfile to use deprecated functionality */
+#define DNA_DEPRECATED_ALLOW
+
+#include "DNA_object_types.h"
+#include "DNA_layer_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_genfile.h"
+
+#include "BKE_collection.h"
+#include "BKE_layer.h"
+#include "BKE_main.h"
+#include "BKE_scene.h"
+
+#include "BLI_listbase.h"
+#include "BLI_string.h"
+
+#include "BLO_readfile.h"
+#include "readfile.h"
+
+#include "MEM_guardedalloc.h"
+
- void blo_do_versions_after_linking_280(FileData *fd, Library *UNUSED(lib), Main *main)
++void blo_do_versions_after_linking_280(Main *main)
+{
+ if (!MAIN_VERSION_ATLEAST(main, 280, 0)) {
- if (!DNA_struct_elem_find(fd->filesdna, "Scene", "ListBase", "render_layers")) {
- for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
++ for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
++ /* since we don't have access to FileData we check the (always valid) first render layer instead */
++ if (scene->render_layers.first == NULL) {
+ SceneCollection *sc_master = BKE_collection_master(scene);
+ BLI_strncpy(sc_master->name, "Master Collection", sizeof(sc_master->name));
+
+ SceneCollection *collections[20] = {NULL};
+ bool is_visible[20];
+
+ int lay_used = 0;
+ for (int i = 0; i < 20; i++) {
+ char name[MAX_NAME];
+
+ BLI_snprintf(name, sizeof(collections[i]->name), "%d", i + 1);
+ collections[i] = BKE_collection_add(scene, sc_master, name);
+
+ is_visible[i] = (scene->lay & (1 << i));
+ }
+
+ for (Base *base = scene->base.first; base; base = base->next) {
+ lay_used |= base->lay & ((1 << 20) - 1); /* ignore localview */
+
+ for (int i = 0; i < 20; i++) {
+ if ((base->lay & (1 << i)) != 0) {
+ BKE_collection_object_add(scene, collections[i], base->object);
+ }
+ }
+ }
+
+ if (!BKE_scene_uses_blender_game(scene)) {
+ for (SceneRenderLayer *srl = scene->r.layers.first; srl; srl = srl->next) {
+
+ SceneLayer *sl = BKE_scene_layer_add(scene, srl->name);
+ BKE_scene_layer_engine_set(sl, scene->r.engine);
+
+ if (srl->mat_override) {
+ BKE_collection_override_datablock_add((LayerCollection *)sl->layer_collections.first, "material", (ID *)srl->mat_override);
+ }
+
+ if (srl->light_override && BKE_scene_uses_blender_internal(scene)) {
+ /* not sure how we handle this, pending until we design the override system */
+ TODO_LAYER_OVERRIDE;
+ }
+
+ if (srl->lay != scene->lay) {
+ /* unlink master collection */
+ BKE_collection_unlink(sl, sl->layer_collections.first);
+
+ /* add new collection bases */
+ for (int i = 0; i < 20; i++) {
+ if ((srl->lay & (1 << i)) != 0) {
+ BKE_collection_link(sl, collections[i]);
+ }
+ }
+ }
+
+ /* TODO: passes, samples, mask_layesr, exclude, ... */
+ }
+ }
+
+ SceneLayer *sl = BKE_scene_layer_add(scene, "Render Layer");
+
+ /* In this particular case we can safely assume the data struct */
+ LayerCollection *lc = ((LayerCollection *)sl->layer_collections.first)->layer_collections.first;
+ for (int i = 0; i < 20; i++) {
+ if (!is_visible[i]) {
+ lc->flag &= ~COLLECTION_VISIBLE;
+ }
+ lc = lc->next;
+ }
+
+ /* TODO: copy scene render data to layer */
+
+ /* Cleanup */
+ for (int i = 0; i < 20; i++) {
+ if ((lay_used & (1 << i)) == 0) {
+ BKE_collection_remove(scene, collections[i]);
+ }
+ }
+ }
+ }
+ }
+}
+
+void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
+{
+ if (!MAIN_VERSION_ATLEAST(main, 280, 0)) {
+ if (!DNA_struct_elem_find(fd->filesdna, "Scene", "ListBase", "render_layers")) {
+ for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+ /* Master Collection */
+ scene->collection = MEM_callocN(sizeof(SceneCollection), "Master Collection");
+ BLI_strncpy(scene->collection->name, "Master Collection", sizeof(scene->collection->name));
+ }
+ }
+ }
+}
More information about the Bf-blender-cvs
mailing list