diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-30 13:59:28 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-30 13:59:28 +0300 |
commit | ced2f3f30e8ce2baad5ec9f427803c40011f6642 (patch) | |
tree | b92e555c6d48a28d5fe64205b955743ff7fe71cf /source | |
parent | 03a5eccc945497da3cffafdf050c17fb4ccf999c (diff) | |
parent | 059b878240a93a022eadce74b387ee737f8f1ab5 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/depsgraph/DEG_depsgraph.h | 7 | ||||
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_tag.cc | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/depsgraph/DEG_depsgraph.h b/source/blender/depsgraph/DEG_depsgraph.h index b95fea24053..6bcbff4950b 100644 --- a/source/blender/depsgraph/DEG_depsgraph.h +++ b/source/blender/depsgraph/DEG_depsgraph.h @@ -179,10 +179,9 @@ void DEG_graph_id_tag_update(struct Main *bmain, struct ID *id, int flag); -/* Tag given ID type for update. - * - * Used by all sort of render engines to quickly check if - * IDs of a given type need to be checked for update. +/* Mark a particular datablock type as having changing. This does + * not cause any updates but is used by external render engines to detect if for + * example a datablock was removed. */ void DEG_id_type_tag(struct Main *bmain, short id_type); diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index 89e90e70a68..c2711eb3f15 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -518,7 +518,7 @@ void DEG_graph_id_tag_update(struct Main *bmain, DEG::deg_graph_id_tag_update(bmain, graph, id, flag); } -/* Tag given ID type for update. */ +/* Mark a particular datablock type as having changing. */ void DEG_id_type_tag(Main *bmain, short id_type) { if (id_type == ID_NT) { |