diff options
| author | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
| commit | 0829cebeb024095c268f190c34daa8ae9a5a224c (patch) | |
| tree | 12ee5a4a1c2a32e12eff47c8eb9bb0ed217791c1 /source/blender/functions/FN_cpp_types.hh | |
| parent | cfde6ebf450594faa57c4bfeaecff10fe512c91b (diff) | |
| parent | 42be3964eb201180f6b0fa1ff6ce43b8c3845bc2 (diff) | |
Merge branch 'master' into asset-uuid--archivedasset-uuid--archived
Diffstat (limited to 'source/blender/functions/FN_cpp_types.hh')
| -rw-r--r-- | source/blender/functions/FN_cpp_types.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/functions/FN_cpp_types.hh b/source/blender/functions/FN_cpp_types.hh index 6ee8788cd52..c39b284d5c4 100644 --- a/source/blender/functions/FN_cpp_types.hh +++ b/source/blender/functions/FN_cpp_types.hh @@ -27,7 +27,7 @@ #include "FN_cpp_type.hh" namespace blender { -namespace FN { +namespace fn { extern const CPPType &CPPType_bool; @@ -44,7 +44,7 @@ extern const CPPType &CPPType_Color4b; extern const CPPType &CPPType_string; -} // namespace FN +} // namespace fn } // namespace blender #endif /* __FN_CPP_TYPES_HH__ */ |