[Bf-blender-cvs] [6bbb82cf79e] master: Depsgraph: Use new animation cache for visibility check
Sergey Sharybin
noreply at git.blender.org
Tue Apr 30 11:32:15 CEST 2019
Commit: 6bbb82cf79e03cf96947933da292d2666bf81dd6
Author: Sergey Sharybin
Date: Mon Apr 29 14:11:32 2019 +0200
Branches: master
https://developer.blender.org/rB6bbb82cf79e03cf96947933da292d2666bf81dd6
Depsgraph: Use new animation cache for visibility check
Should be no functional changes, just switching code to use more
generic checks now.
One thing which goes a bit deeper than that is check for whether
base is a part of dependency graph. This is now done by explicitly
tagging corresponding ID node (of an object) rather than doing
animation check again.
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder.cc
M source/blender/depsgraph/intern/builder/deg_builder.h
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
M source/blender/depsgraph/intern/node/deg_node_id.cc
M source/blender/depsgraph/intern/node/deg_node_id.h
===================================================================
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc
index bcf397da335..5e35a620c81 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder.cc
@@ -41,6 +41,7 @@ extern "C" {
#include "intern/depsgraph.h"
#include "intern/depsgraph_tag.h"
#include "intern/depsgraph_type.h"
+#include "intern/builder/deg_builder_cache.h"
#include "intern/eval/deg_eval_copy_on_write.h"
#include "intern/node/deg_node.h"
#include "intern/node/deg_node_id.h"
@@ -51,6 +52,16 @@ extern "C" {
namespace DEG {
+bool deg_check_base_in_depsgraph(const Depsgraph *graph, Base *base)
+{
+ Object *object_orig = base->base_orig->object;
+ IDNode *id_node = graph->find_id_node(&object_orig->id);
+ if (id_node == NULL) {
+ return false;
+ }
+ return id_node->has_base;
+}
+
/*******************************************************************************
* Base class for builders.
*/
@@ -60,62 +71,30 @@ DepsgraphBuilder::DepsgraphBuilder(Main *bmain, Depsgraph *graph, DepsgraphBuild
{
}
-namespace {
-
-struct VisibilityCheckData {
- eEvaluationMode eval_mode;
- bool is_visibility_animated;
-};
-
-void visibility_animated_check_cb(ID * /*id*/, FCurve *fcu, void *user_data)
+bool DepsgraphBuilder::need_pull_base_into_graph(Base *base)
{
- VisibilityCheckData *data = reinterpret_cast<VisibilityCheckData *>(user_data);
- if (data->is_visibility_animated) {
- return;
+ /* Simple check: enabled bases are always part of dependency graph. */
+ const int base_flag = (graph_->mode == DAG_EVAL_VIEWPORT) ? BASE_ENABLED_VIEWPORT :
+ BASE_ENABLED_RENDER;
+ if (base->flag & base_flag) {
+ return true;
}
- if (data->eval_mode == DAG_EVAL_VIEWPORT) {
- if (STREQ(fcu->rna_path, "hide_viewport")) {
- data->is_visibility_animated = true;
- }
+ /* More involved check: since we don't support dynamic changes in dependency graph topology and
+ * all visible objects are to be part of dependency graph, we pull all objects which has animated
+ * visibility. */
+ Object *object = base->object;
+ AnimatedPropertyID property_id;
+ if (graph_->mode == DAG_EVAL_VIEWPORT) {
+ property_id = AnimatedPropertyID(&object->id, &RNA_Object, "hide_viewport");
}
- else if (data->eval_mode == DAG_EVAL_RENDER) {
- if (STREQ(fcu->rna_path, "hide_render")) {
- data->is_visibility_animated = true;
- }
+ else if (graph_->mode == DAG_EVAL_RENDER) {
+ property_id = AnimatedPropertyID(&object->id, &RNA_Object, "hide_render");
}
-}
-
-bool is_object_visibility_animated(const Depsgraph *graph, Object *object)
-{
- AnimData *anim_data = BKE_animdata_from_id(&object->id);
- if (anim_data == NULL) {
+ else {
+ BLI_assert(!"Unknown evaluation mode.");
return false;
}
- VisibilityCheckData data;
- data.eval_mode = graph->mode;
- data.is_visibility_animated = false;
- BKE_fcurves_id_cb(&object->id, visibility_animated_check_cb, &data);
- return data.is_visibility_animated;
-}
-
-} // namespace
-
-bool deg_check_base_available_for_build(const Depsgraph *graph, Base *base)
-{
- const int base_flag = (graph->mode == DAG_EVAL_VIEWPORT) ? BASE_ENABLED_VIEWPORT :
- BASE_ENABLED_RENDER;
- if (base->flag & base_flag) {
- return true;
- }
- if (is_object_visibility_animated(graph, base->object)) {
- return true;
- }
- return false;
-}
-
-bool DepsgraphBuilder::need_pull_base_into_graph(Base *base)
-{
- return deg_check_base_available_for_build(graph_, base);
+ return cache_->isPropertyAnimated(&object->id, property_id);
}
/*******************************************************************************
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.h b/source/blender/depsgraph/intern/builder/deg_builder.h
index 88df0e870f3..2f5bc42aeae 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder.h
@@ -33,7 +33,7 @@ class DepsgraphBuilderCache;
class DepsgraphBuilder {
public:
- bool need_pull_base_into_graph(struct Base *base);
+ bool need_pull_base_into_graph(Base *base);
protected:
/* NOTE: The builder does NOT take ownership over any of those resources. */
@@ -45,7 +45,7 @@ class DepsgraphBuilder {
DepsgraphBuilderCache *cache_;
};
-bool deg_check_base_available_for_build(const Depsgraph *graph, Base *base);
+bool deg_check_base_in_depsgraph(const Depsgraph *graph, Base *base);
void deg_graph_build_finalize(struct Main *bmain, struct Depsgraph *graph);
} // namespace DEG
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 27823bffb87..340f19697cc 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -528,6 +528,7 @@ void DepsgraphNodeBuilder::build_object(int base_index,
if (id_node->linked_state == DEG_ID_LINKED_DIRECTLY) {
id_node->is_directly_visible |= is_visible;
}
+ id_node->has_base |= (base_index != -1);
return;
}
/* Create ID node for object and begin init. */
@@ -540,6 +541,7 @@ void DepsgraphNodeBuilder::build_object(int base_index,
else {
id_node->is_directly_visible = is_visible;
}
+ id_node->has_base |= (base_index != -1);
/* Various flags, flushing from bases/collections. */
build_object_flags(base_index, object, linked_state);
/* Transform. */
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index 49975407c0b..b2ac103cc64 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -380,7 +380,7 @@ void view_layer_remove_disabled_bases(const Depsgraph *depsgraph, ViewLayer *vie
* points to is not yet copied. This is dangerous access from evaluated
* domain to original one, but this is how the entire copy-on-write works:
* it does need to access original for an initial copy. */
- const bool is_object_enabled = deg_check_base_available_for_build(depsgraph, base->base_orig);
+ const bool is_object_enabled = deg_check_base_in_depsgraph(depsgraph, base);
if (is_object_enabled) {
BLI_addtail(&enabled_bases, base);
}
diff --git a/source/blender/depsgraph/intern/node/deg_node_id.cc b/source/blender/depsgraph/intern/node/deg_node_id.cc
index 77e8f4f37e0..c5b9c56bcf0 100644
--- a/source/blender/depsgraph/intern/node/deg_node_id.cc
+++ b/source/blender/depsgraph/intern/node/deg_node_id.cc
@@ -111,6 +111,7 @@ void IDNode::init(const ID *id, const char *UNUSED(subdata))
linked_state = DEG_ID_LINKED_INDIRECTLY;
is_directly_visible = true;
is_collection_fully_expanded = false;
+ has_base = false;
visible_components_mask = 0;
previously_visible_components_mask = 0;
diff --git a/source/blender/depsgraph/intern/node/deg_node_id.h b/source/blender/depsgraph/intern/node/deg_node_id.h
index 34d78e29060..b4351ec988c 100644
--- a/source/blender/depsgraph/intern/node/deg_node_id.h
+++ b/source/blender/depsgraph/intern/node/deg_node_id.h
@@ -96,6 +96,9 @@ struct IDNode : public Node {
* recursed into. */
bool is_collection_fully_expanded;
+ /* Is used to figure out whether object came to the dependency graph via a base. */
+ bool has_base;
+
IDComponentsMask visible_components_mask;
IDComponentsMask previously_visible_components_mask;
More information about the Bf-blender-cvs
mailing list