Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2020-11-16 14:07:51 +0300
committerJacques Lucke <jacques@blender.org>2020-11-16 14:07:51 +0300
commit6ba6e97407e5b4d3feee6edf7b6b66caf8313491 (patch)
tree24d12167824b5fc1c10ad9612ac30f6e2c29f582 /source/blender/depsgraph/intern
parent4913b624d89dcb4f76b132e2ec6908e207d09905 (diff)
Geometry Nodes: Move GeometrySet classes to global namespace
Brecht and I decided to move the GeometrySet classes to the global namespace for now. This way we can use the same type in C and C++ and don't have to use reinterpret_cast as often.
Diffstat (limited to 'source/blender/depsgraph/intern')
-rw-r--r--source/blender/depsgraph/intern/depsgraph_query_iter.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index c82584e1858..98986aae388 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -61,7 +61,6 @@
#endif
namespace deg = blender::deg;
-namespace bke = blender::bke;
/* ************************ DEG ITERATORS ********************* */
@@ -144,8 +143,7 @@ bool deg_iterator_components_step(BLI_Iterator *iter)
return true;
}
- bke::GeometrySet *geometry_set = bke::unwrap(
- data->geometry_component_owner->runtime.geometry_set_eval);
+ GeometrySet *geometry_set = data->geometry_component_owner->runtime.geometry_set_eval;
if (geometry_set == nullptr) {
data->geometry_component_owner = nullptr;
return false;