[Bf-blender-cvs] [baaf81e13ed] blender2.8: Merge branch 'master' into blender2.8
Sergey Sharybin
noreply at git.blender.org
Wed Nov 29 17:59:29 CET 2017
Commit: baaf81e13edc2b25dee7af67f49e7a731d057513
Author: Sergey Sharybin
Date: Wed Nov 29 17:59:04 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBbaaf81e13edc2b25dee7af67f49e7a731d057513
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
index 5f7dbb3dd84,00000000000..408ec96f5fa
mode 100644,000000..100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
@@@ -1,168 -1,0 +1,150 @@@
+/*
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2013 Blender Foundation.
+ * All rights reserved.
+ *
+ * Original Author: Joshua Leung
+ * Contributor(s): Based on original depsgraph.c code - Blender Foundation (2005-2013)
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
+ * \ingroup depsgraph
+ *
+ * Methods for constructing depsgraph's nodes
+ */
+
+#include "intern/builder/deg_builder_nodes.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_utildefines.h"
+#include "BLI_blenlib.h"
+#include "BLI_string.h"
+
+extern "C" {
+#include "DNA_node_types.h"
+#include "DNA_layer_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+
+#include "BKE_layer.h"
+#include "BKE_main.h"
+#include "BKE_node.h"
+} /* extern "C" */
+
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
+#include "intern/builder/deg_builder.h"
+#include "intern/nodes/deg_node.h"
+#include "intern/nodes/deg_node_component.h"
+#include "intern/nodes/deg_node_operation.h"
+#include "intern/depsgraph_types.h"
+#include "intern/depsgraph_intern.h"
+#include "util/deg_util_foreach.h"
+
+namespace DEG {
+
+void DepsgraphNodeBuilder::build_view_layer(Scene *scene,
+ ViewLayer *view_layer,
+ eDepsNode_LinkedState_Type linked_state)
+{
+ Scene *scene_cow;
+ ViewLayer *view_layer_cow;
+ if (DEG_depsgraph_use_copy_on_write()) {
+ /* Make sure we've got ID node, so we can get pointer to CoW datablock.
+ */
+ scene_cow = expand_cow_datablock(scene);
+ view_layer_cow = (ViewLayer *)BLI_findstring(
+ &scene_cow->view_layers,
+ view_layer->name,
+ offsetof(ViewLayer, name));
+ }
+ else {
+ scene_cow = scene;
+ view_layer_cow = view_layer;
+ }
-
- /* scene ID block */
++ /* Scene ID block. */
+ add_id_node(&scene->id);
-
- /* timesource */
++ /* Rimesource. */
+ add_time_source();
-
+ /* Setup currently building context. */
+ scene_ = scene;
-
- /* scene objects */
++ /* Scene objects. */
+ int select_color = 1;
+ LINKLIST_FOREACH(Base *, base, &view_layer_cow->object_bases) {
+ /* object itself */
+ build_object(base, base->object, linked_state);
+ base->object->select_color = select_color++;
+ }
+ if (scene->camera != NULL) {
+ build_object(NULL, scene->camera, DEG_ID_LINKED_INDIRECTLY);
+ }
-
- /* rigidbody */
- if (scene->rigidbody_world) {
++ /* Rigidbody. */
++ if (scene->rigidbody_world != NULL) {
+ build_rigidbody(scene);
+ }
-
- /* scene's animation and drivers */
- if (scene->adt) {
++ /* Scene's animation and drivers. */
++ if (scene->adt != NULL) {
+ build_animdata(&scene->id);
+ }
-
- /* world */
- if (scene->world) {
++ /* World. */
++ if (scene->world != NULL) {
+ build_world(scene->world);
+ }
-
- /* compo nodes */
- if (scene->nodetree) {
++ /* Compositor nodes */
++ if (scene->nodetree != NULL) {
+ build_compositor(scene);
+ }
-
- /* sequencer */
- // XXX...
-
- /* grease pencil */
- if (scene->gpd) {
++ /* Grease pencil. */
++ if (scene->gpd != NULL) {
+ build_gpencil(scene->gpd);
+ }
-
+ /* Cache file. */
+ LINKLIST_FOREACH (CacheFile *, cachefile, &bmain_->cachefiles) {
+ build_cachefile(cachefile);
+ }
-
+ /* Masks. */
+ LINKLIST_FOREACH (Mask *, mask, &bmain_->mask) {
+ build_mask(mask);
+ }
-
+ /* Movie clips. */
+ LINKLIST_FOREACH (MovieClip *, clip, &bmain_->movieclip) {
+ build_movieclip(clip);
+ }
-
+ /* Collections. */
+ build_view_layer_collections(scene_cow, view_layer_cow);
-
+ /* Parameters evaluation for scene relations mainly. */
+ add_operation_node(&scene->id,
+ DEG_NODE_TYPE_PARAMETERS,
+ NULL,
+ DEG_OPCODE_PLACEHOLDER,
+ "Scene Eval");
-
+ /* Build all set scenes. */
+ if (scene->set != NULL) {
+ ViewLayer *set_view_layer = BKE_view_layer_from_scene_get(scene->set);
+ build_view_layer(scene->set, set_view_layer, DEG_ID_LINKED_VIA_SET);
+ }
+}
+
+} // namespace DEG
diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
index d23fdaacf08,00000000000..2058fd37716
mode 100644,000000..100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
@@@ -1,142 -1,0 +1,131 @@@
+/*
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2013 Blender Foundation.
+ * All rights reserved.
+ *
+ * Original Author: Joshua Leung
+ * Contributor(s): Based on original depsgraph.c code - Blender Foundation (2005-2013)
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
+ * \ingroup depsgraph
+ *
+ * Methods for constructing depsgraph
+ */
+
+#include "intern/builder/deg_builder_relations.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <cstring> /* required for STREQ later on. */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_utildefines.h"
+#include "BLI_blenlib.h"
+
+extern "C" {
+#include "DNA_node_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+
+#include "BKE_layer.h"
+#include "BKE_main.h"
+#include "BKE_node.h"
+} /* extern "C" */
+
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
+#include "intern/builder/deg_builder.h"
+#include "intern/builder/deg_builder_pchanmap.h"
+
+#include "intern/nodes/deg_node.h"
+#include "intern/nodes/deg_node_component.h"
+#include "intern/nodes/deg_node_operation.h"
+
+#include "intern/depsgraph_intern.h"
+#include "intern/depsgraph_types.h"
+
+#include "util/deg_util_foreach.h"
+
+namespace DEG {
+
+void DepsgraphRelationBuilder::build_view_layer(Scene *scene, ViewLayer *view_layer)
+{
+ /* Setup currently building context. */
+ scene_ = scene;
-
- /* scene objects */
++ /* Scene objects. */
+ LINKLIST_FOREACH(Base *, base, &view_layer->object_bases) {
+ build_object(base, base->object);
+ }
+ if (scene->camera != NULL) {
+ build_object(NULL, scene->camera);
+ }
-
- /* rigidbody */
- if (scene->rigidbody_world) {
++ /* Rigidbody. */
++ if (scene->rigidbody_world != NULL) {
+ build_rigidbody(scene);
+ }
-
- /* scene's animation and drivers */
- if (scene->adt) {
++ /* Scene's animation and drivers. */
++ if (scene->adt != NULL) {
+ build_animdata(&scene->id);
+ }
-
- /* world */
- if (scene->world) {
++ /* World. */
++ if (scene->world != NULL) {
+ build_world(scene->world);
+ }
-
- /* compo nodes */
- if (scene->nodetree) {
++ /* Compositor nodes. */
++ if (scene->nodetree != NULL) {
+ build_compositor(scene);
+ }
-
- /* grease pencil */
- if (scene->gpd) {
++ /* Grease pencil. */
++ if (scene->gpd != NULL) {
+ build_gpencil(scene->gpd);
+ }
-
+ /* Masks. */
+ LINKLIST_FOREACH (Mask *, mask, &bmain_->mask) {
+ build_mask(mask);
+ }
-
+ /* Movie clips. */
+ LINKLIST_FOREACH (MovieClip *, clip, &bmain_->movieclip) {
+ build_movieclip(clip);
+ }
-
+ /* Collections. */
+ build_view_layer_collections(view_layer);
-
+ /* TODO(sergey): Do this flush on CoW object? */
+ foreach (OperationDepsNode *node, graph_->operations) {
+ IDDepsNode *id_node = node->owner->owner;
+ ID *id = id_node->id_orig;
+ if (GS(id->name) == ID_OB) {
+ Object *object = (Object *)id;
+ object->customdata_mask |= node->customdata_mask;
+ }
+ }
-
+ /* Build all set scenes. */
+ if (scene->set != NULL) {
+ ViewLayer *set_view_layer = BKE_view_layer_from_scene_get(scene->set);
+ build_view_layer(scene->set, set_view_layer);
+ }
+
+ graph_->scene = scene;
+ graph_->view_layer = view_layer;
+}
+
+} // namespace DEG
More information about the Bf-blender-cvs
mailing list