[Bf-blender-cvs] [a52452c043b] blender2.8: Merge branch 'master' into blender2.8

Sergey Sharybin noreply at git.blender.org
Wed Dec 20 16:42:22 CET 2017


Commit: a52452c043b34c664f2772a6f72b886ac641acd7
Author: Sergey Sharybin
Date:   Wed Dec 20 16:40:49 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBa52452c043b34c664f2772a6f72b886ac641acd7

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder.cc
index 1e906d454ac,5713297d658..2fcad233044
--- a/source/blender/depsgraph/intern/builder/deg_builder.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder.cc
@@@ -36,6 -37,13 +36,7 @@@
  #include "intern/depsgraph.h"
  #include "intern/depsgraph_types.h"
  #include "intern/nodes/deg_node.h"
 -#include "intern/nodes/deg_node_component.h"
+ #include "intern/nodes/deg_node_id.h"
 -#include "intern/nodes/deg_node_operation.h"
  
  #include "util/deg_util_foreach.h"
  
diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index eb297682308,85e80f80d26..60562641c93
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@@ -103,9 -103,9 +103,10 @@@ extern "C" 
  #include "DEG_depsgraph_build.h"
  
  #include "intern/builder/deg_builder.h"
 +#include "intern/eval/deg_eval_copy_on_write.h"
  #include "intern/nodes/deg_node.h"
  #include "intern/nodes/deg_node_component.h"
+ #include "intern/nodes/deg_node_id.h"
  #include "intern/nodes/deg_node_operation.h"
  #include "intern/depsgraph_types.h"
  #include "intern/depsgraph_intern.h"
diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
index 29cff0cb28d,00000000000..9b3e46df69a
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,135 -1,0 +1,136 @@@
 +/*
 + * ***** 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_view_layer.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_id.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. */
 +	/* NOTE: Nodes builder requires us to pass CoW base because it's being
 +	 * passed to the evaluation functions. During relations builder we only
 +	 * do NULL-pointer check of the base, so it's fine to pass original one.
 +	 */
 +	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 != NULL) {
 +		build_rigidbody(scene);
 +	}
 +	/* Scene's animation and drivers. */
 +	if (scene->adt != NULL) {
 +		build_animdata(&scene->id);
 +	}
 +	/* World. */
 +	if (scene->world != NULL) {
 +		build_world(scene->world);
 +	}
 +	/* Compositor nodes. */
 +	if (scene->nodetree != NULL) {
 +		build_compositor(scene);
 +	}
 +	/* 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(&scene_->id, 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
diff --cc source/blender/depsgraph/intern/depsgraph.cc
index 995157f5c9a,c4841d6789e..45013bb1bcd
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@@ -53,11 -56,11 +54,13 @@@ extern "C" 
  
  #include "DEG_depsgraph.h"
  
 +#include "intern/eval/deg_eval_copy_on_write.h"
 +
  #include "intern/nodes/deg_node.h"
  #include "intern/nodes/deg_node_component.h"
+ #include "intern/nodes/deg_node_id.h"
  #include "intern/nodes/deg_node_operation.h"
+ #include "intern/nodes/deg_node_time.h"
  
  #include "intern/depsgraph_intern.h"
  #include "util/deg_util_foreach.h"
@@@ -78,12 -69,20 +81,20 @@@ namespace DEG 
  
  static DEG_EditorUpdateIDCb deg_editor_update_id_cb = NULL;
  static DEG_EditorUpdateSceneCb deg_editor_update_scene_cb = NULL;
 -static DEG_EditorUpdateScenePreCb deg_editor_update_scene_pre_cb = NULL;
  
+ /* TODO(sergey): Find a better place for this. */
+ template <typename T>
+ static void remove_from_vector(vector<T> *vector, const T& value)
+ {
+ 	vector->erase(std::remove(vector->begin(), vector->end(), value),
+ 	              vector->end());
+ }
+ 
  Depsgraph::Depsgraph()
    : time_source(NULL),
 -    need_update(false),
 -    layers(0)
 +    need_update(true),
 +    scene(NULL),
 +    view_layer(NULL)
  {
  	BLI_spin_init(&lock);
  	id_hash = BLI_ghash_ptr_new("Depsgraph id hash");
diff --cc source/blender/depsgraph/intern/depsgraph_query.cc
index 6892bdaa178,9b1961baa48..98bf335f89e
--- a/source/blender/depsgraph/intern/depsgraph_query.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query.cc
@@@ -46,10 -40,11 +46,11 @@@ extern "C" 
  #include "DEG_depsgraph_query.h"
  
  #include "intern/depsgraph_intern.h"
+ #include "intern/nodes/deg_node_id.h"
  
 -bool DEG_id_type_tagged(Main *bmain, short idtype)
 +bool DEG_id_type_tagged(Main *bmain, short id_type)
  {
 -	return bmain->id_tag_update[BKE_idcode_to_index(idtype)] != 0;
 +	return bmain->id_tag_update[BKE_idcode_to_index(id_type)] != 0;
  }
  
  short DEG_get_eval_flags_for_id(Depsgraph *graph, ID *id)
diff --cc source/blender/depsgraph/intern/depsgraph_query_iter.cc
index a7f37575ff6,00000000000..2a323fe63bd
mode 100644,000000..100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@@ -1,227 -1,0 +1,229 @@@
 +/*
 + * ***** 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) 2017 Blender Foundation.
 + * All rights reserved.
 + *
 + * Original Author: Dalai Felinto
 + * Contributor(s): Sergey Sharybin
 + *
 + * ***** END GPL LICENSE BLOCK *****
 + */
 +
 +/** \file blender/depsgraph/intern/depsgraph_query_iter.cc
 + *  \ingroup depsgraph
 + *
 + * Implementation of Querying and Filtering API's
 + */
 +
 +#include "MEM_guardedalloc.h"
 +
 +extern "C" {
 +#include "BLI_utildefines.h"
 +#include "BLI_math.h"
 +#include "BKE_anim.h"
 +#include "BKE_idprop.h"
 +#include "BKE_layer.h"
 +#include "BKE_object.h"
 +} /* extern "C" */
 +
 +#include "DNA_object_types.h"
 +#include "DNA_scene_types.h"
 +
 +#include "DEG_depsgraph.h"
 +#include "DEG_depsgraph_query.h"
 +
 +#include "intern/depsgraph_intern.h"
 +#include "util/deg_util_foreach.h"
 +
++#include "intern/nodes/deg_node_id.h"
++
 +#ifndef NDEBUG
 +#  include "intern/eval/deg_eval_copy_on_write.h"
 +#endif
 +
 +/* ************************ DEG ITERATORS ********************* */
 +
 +static bool deg_objects_dupli_iterator_next(BLI_Iterator *iter)
 +{
 +	DEGObjectIterData *data = (DEGObjectIterData *)iter->data;
 +	while (data->dupli_object_next != NULL) {
 +		DupliObject *dob = data->dupli_object_next;
 +		Object *obd = dob->ob;
 +
 +		data->dupli_object_next = data->dupli_object_next->next;
 +
 +		/* Group duplis need to set ob matrices correct, for deform. so no_dr

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list