diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-02-15 19:27:03 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-02-15 19:27:03 +0300 |
| commit | a9f023e226389461b1140f80e62f650d009a06a5 (patch) | |
| tree | 2d3b860bf5d5996e77b102673bd0cbaef4d15f26 /source/blender/nodes/function | |
| parent | 3ed3ee253b12fe4d481357386650a13de244caf9 (diff) | |
BLI: Change dependencies in vector math files
This patch reverses the dependency between `BLI_math_vec_types.hh` and
`BLI_math_vector.hh`. Now the higher level `blender::math` functions
depend on the header that defines the types they work with, rather than
the other way around.
The initial goal was to allow defining an `enable_if` in the types header
and using it in the math header. But I also think this operations to types
dependency is more natural anyway.
This required changing the includes some files used from the type
header to the math implementation header. I took that change a bit
further removing the C vector math header from the C++ header;
I think that helps to make the transition between the two systems
clearer.
Differential Revision: https://developer.blender.org/D14112
Diffstat (limited to 'source/blender/nodes/function')
3 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/nodes/function/node_function_util.hh b/source/blender/nodes/function/node_function_util.hh index 05130949d23..fd0b6c31b1d 100644 --- a/source/blender/nodes/function/node_function_util.hh +++ b/source/blender/nodes/function/node_function_util.hh @@ -4,7 +4,7 @@ #include <string.h> -#include "BLI_math_vec_types.hh" +#include "BLI_math_vector.hh" #include "BLI_utildefines.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc b/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc index e3d3b8f5ebc..2cb455832e5 100644 --- a/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc +++ b/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#include "BLI_math_vector.h" #include "BLI_task.hh" #include "RNA_enum_types.h" diff --git a/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc b/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc index cf5f1f2d336..3718ce6f359 100644 --- a/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc +++ b/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #include "BLI_listbase.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "RNA_enum_types.h" |