[Bf-blender-cvs] [3ea54688b12] master: Depsgraph: Use more correct update source for an internal tags
Sergey Sharybin
noreply at git.blender.org
Thu Jan 31 14:34:46 CET 2019
Commit: 3ea54688b1239aa796ee2cff891e9766a3d06a20
Author: Sergey Sharybin
Date: Wed Jan 30 11:23:44 2019 +0100
Branches: master
https://developer.blender.org/rB3ea54688b1239aa796ee2cff891e9766a3d06a20
Depsgraph: Use more correct update source for an internal tags
Dependency graph will poke some IDs for recalc after finishing building.
Those shouldn't be considered as a user edit.
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder.cc
M source/blender/depsgraph/intern/depsgraph_intern.h
M source/blender/depsgraph/intern/depsgraph_tag.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc
index 10369cb295a..97e7c8654bd 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder.cc
@@ -43,6 +43,7 @@ extern "C" {
}
#include "intern/depsgraph.h"
+#include "intern/depsgraph_intern.h"
#include "intern/depsgraph_types.h"
#include "intern/eval/deg_eval_copy_on_write.h"
#include "intern/nodes/deg_node.h"
@@ -150,10 +151,11 @@ void deg_graph_build_finalize(Main *bmain, Depsgraph *graph)
}
}
if (flag != 0) {
- DEG_graph_id_tag_update(bmain,
- (::Depsgraph *)graph,
+ deg_graph_id_tag_update(bmain,
+ graph,
id_node->id_orig,
- flag);
+ flag,
+ DEG_UPDATE_SOURCE_RELATIONS);
}
}
}
diff --git a/source/blender/depsgraph/intern/depsgraph_intern.h b/source/blender/depsgraph/intern/depsgraph_intern.h
index 1f8364a5174..730e853363f 100644
--- a/source/blender/depsgraph/intern/depsgraph_intern.h
+++ b/source/blender/depsgraph/intern/depsgraph_intern.h
@@ -149,5 +149,7 @@ void deg_clear_physics_relations(Depsgraph *graph);
/* Tagging Utilities -------------------------------------------------------- */
eDepsNode_Type deg_geometry_tag_to_component(const ID *id);
+void deg_id_tag_update(Main *bmain, ID *id, int flag, eUpdateSource update_source);
+void deg_graph_id_tag_update(Main *bmain, Depsgraph *graph, ID *id, int flag, eUpdateSource update_source);
} // namespace DEG
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index 249740c2c2a..69f35323969 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -82,8 +82,6 @@ namespace DEG {
namespace {
-void deg_graph_id_tag_update(Main *bmain, Depsgraph *graph, ID *id, int flag);
-
void depsgraph_geometry_tag_to_component(const ID *id,
eDepsNode_Type *component_type)
{
@@ -112,8 +110,7 @@ void depsgraph_select_tag_to_component_opcode(
*
* TODO(sergey): We can introduce explicit exit operation which
* does nothing and which is only used to cascade flush down the
- * road.
- */
+ * road. */
*component_type = DEG_NODE_TYPE_LAYER_COLLECTIONS;
*operation_code = DEG_OPCODE_VIEW_LAYER_EVAL;
}
@@ -192,8 +189,7 @@ void depsgraph_tag_to_component_opcode(const ID *id,
* - For particle settings node we need to use different
* component. Will be nice to get this unified with object,
* but we can survive for now with single exception here.
- * Particles needs reconsideration anyway,
- */
+ * Particles needs reconsideration anyway, */
*component_type = DEG_NODE_TYPE_PARTICLE_SETTINGS;
*operation_code = psysTagToOperationCode(tag);
}
@@ -227,8 +223,7 @@ void depsgraph_tag_to_component_opcode(const ID *id,
break;
case ID_RECALC_EDITORS:
/* There is no such node in depsgraph, this tag is to be handled
- * separately.
- */
+ * separately. */
break;
case ID_RECALC_ALL:
case ID_RECALC_PSYS_ALL:
@@ -237,20 +232,23 @@ void depsgraph_tag_to_component_opcode(const ID *id,
}
}
-void id_tag_update_ntree_special(Main *bmain, Depsgraph *graph, ID *id, int flag)
+void id_tag_update_ntree_special(Main *bmain,
+ Depsgraph *graph,
+ ID *id,
+ int flag,
+ eUpdateSource update_source)
{
bNodeTree *ntree = ntreeFromID(id);
if (ntree == NULL) {
return;
}
- deg_graph_id_tag_update(bmain, graph, &ntree->id, flag);
+ deg_graph_id_tag_update(bmain, graph, &ntree->id, flag, update_source);
}
void depsgraph_update_editors_tag(Main *bmain, Depsgraph *graph, ID *id)
{
/* NOTE: We handle this immediately, without delaying anything, to be
- * sure we don't cause threading issues with OpenGL.
- */
+ * sure we don't cause threading issues with OpenGL. */
/* TODO(sergey): Make sure this works for CoW-ed datablocks as well. */
DEGEditorUpdateContext update_ctx = {NULL};
update_ctx.bmain = bmain;
@@ -263,7 +261,8 @@ void depsgraph_update_editors_tag(Main *bmain, Depsgraph *graph, ID *id)
void depsgraph_tag_component(Depsgraph *graph,
IDDepsNode *id_node,
eDepsNode_Type component_type,
- eDepsOperation_Code operation_code)
+ eDepsOperation_Code operation_code,
+ eUpdateSource update_source)
{
ComponentDepsNode *component_node =
id_node->find_component(component_type);
@@ -271,20 +270,20 @@ void depsgraph_tag_component(Depsgraph *graph,
return;
}
if (operation_code == DEG_OPCODE_OPERATION) {
- component_node->tag_update(graph, DEG_UPDATE_SOURCE_USER_EDIT);
+ component_node->tag_update(graph, update_source);
}
else {
OperationDepsNode *operation_node =
component_node->find_operation(operation_code);
if (operation_node != NULL) {
- operation_node->tag_update(graph, DEG_UPDATE_SOURCE_USER_EDIT);
+ operation_node->tag_update(graph, update_source);
}
}
/* If component depends on copy-on-write, tag it as well. */
if (component_node->need_tag_cow_before_update()) {
ComponentDepsNode *cow_comp =
id_node->find_component(DEG_NODE_TYPE_COPY_ON_WRITE);
- cow_comp->tag_update(graph, DEG_UPDATE_SOURCE_USER_EDIT);
+ cow_comp->tag_update(graph, update_source);
id_node->id_orig->recalc |= ID_RECALC_COPY_ON_WRITE;
}
}
@@ -293,12 +292,12 @@ void depsgraph_tag_component(Depsgraph *graph,
*
* Mainly, old code was tagging object with ID_RECALC_GEOMETRY tag to inform
* that object's data datablock changed. Now API expects that ID is given
- * explicitly, but not all areas are aware of this yet.
- */
+ * explicitly, but not all areas are aware of this yet. */
void deg_graph_id_tag_legacy_compat(Main *bmain,
Depsgraph *depsgraph,
ID *id,
- IDRecalcFlag tag)
+ IDRecalcFlag tag,
+ eUpdateSource update_source)
{
if (tag == ID_RECALC_GEOMETRY || tag == 0) {
switch (GS(id->name)) {
@@ -307,20 +306,21 @@ void deg_graph_id_tag_legacy_compat(Main *bmain,
Object *object = (Object *)id;
ID *data_id = (ID *)object->data;
if (data_id != NULL) {
- deg_graph_id_tag_update(bmain, depsgraph, data_id, 0);
+ deg_graph_id_tag_update(
+ bmain, depsgraph, data_id, 0, update_source);
}
break;
}
/* TODO(sergey): Shape keys are annoying, maybe we should find a
* way to chain geometry evaluation to them, so we don't need extra
- * tagging here.
- */
+ * tagging here. */
case ID_ME:
{
Mesh *mesh = (Mesh *)id;
ID *key_id = &mesh->key->id;
if (key_id != NULL) {
- deg_graph_id_tag_update(bmain, depsgraph, key_id, 0);
+ deg_graph_id_tag_update(
+ bmain, depsgraph, key_id, 0, update_source);
}
break;
}
@@ -329,7 +329,8 @@ void deg_graph_id_tag_legacy_compat(Main *bmain,
Lattice *lattice = (Lattice *)id;
ID *key_id = &lattice->key->id;
if (key_id != NULL) {
- deg_graph_id_tag_update(bmain, depsgraph, key_id, 0);
+ deg_graph_id_tag_update(
+ bmain, depsgraph, key_id, 0, update_source);
}
break;
}
@@ -338,7 +339,8 @@ void deg_graph_id_tag_legacy_compat(Main *bmain,
Curve *curve = (Curve *)id;
ID *key_id = &curve->key->id;
if (key_id != NULL) {
- deg_graph_id_tag_update(bmain, depsgraph, key_id, 0);
+ deg_graph_id_tag_update(
+ bmain, depsgraph, key_id, 0, update_source);
}
break;
}
@@ -352,7 +354,8 @@ static void deg_graph_id_tag_update_single_flag(Main *bmain,
Depsgraph *graph,
ID *id,
IDDepsNode *id_node,
- IDRecalcFlag tag)
+ IDRecalcFlag tag,
+ eUpdateSource update_source)
{
if (tag == ID_RECALC_EDITORS) {
if (graph != NULL) {
@@ -380,21 +383,20 @@ static void deg_graph_id_tag_update_single_flag(Main *bmain,
/* Some sanity checks before moving forward. */
if (id_node == NULL) {
/* Happens when object is tagged for update and not yet in the
- * dependency graph (but will be after relations update).
- */
+ * dependency graph (but will be after relations update). */
return;
}
/* Tag corresponding dependency graph operation for update. */
if (component_type == DEG_NODE_TYPE_ID_REF) {
- id_node->tag_update(graph, DEG_UPDATE_SOURCE_USER_EDIT);
+ id_node->tag_update(graph, update_source);
}
else {
- depsgraph_tag_component(graph, id_node, component_type, operation_code);
+ depsgraph_tag_component(
+ graph, id_node, component_type, operation_code, update_source);
}
/* TODO(sergey): Get rid of this once all areas are using proper data ID
- * for tagging.
- */
- deg_graph_id_tag_legacy_compat(bmain, graph, id, tag);
+ * for tagging. */
+ deg_graph_id_tag_legacy_compat(bmain, graph, id, tag, update_source);
}
@@ -416,8 +418,7 @@ string stringify_update_bitfield(int flag)
string result = "";
int current_flag = flag;
/* Special cases to avoid ALL flags form being split into
- * individual bits.
- */
+ * individual bits. */
if ((current_flag & ID_RECALC_PSYS_ALL) == ID_RECALC_PSYS_ALL) {
result = stringify_append_bit(result, ID_RECALC_PSYS_ALL);
}
@@ -430,13 +431,27 @@ string stringify_update_bitfield(int flag)
return result;
}
+const char *update_source_as_string(eUpdateSource source)
+{
+ switch (source) {
+ case DEG_UPDATE_SOUR
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list