diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-08-19 18:32:55 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-08-19 18:32:55 +0300 |
| commit | 78e0c936c1e6c74508ad8e58c1b851eb2fd17f48 (patch) | |
| tree | e81427e430269bf729e42788e58e6b4d6ba55284 /source/blender/blenkernel/intern/idprop_create.cc | |
| parent | db46251209decccadaaf9fa096822eb3c91661c1 (diff) | |
| parent | 8f9b812d79fae64ee622760338a7c5920c94ab05 (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/blenkernel/intern/idprop_create.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/idprop_create.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/idprop_create.cc b/source/blender/blenkernel/intern/idprop_create.cc index a2f58baebf7..24f59d5e49e 100644 --- a/source/blender/blenkernel/intern/idprop_create.cc +++ b/source/blender/blenkernel/intern/idprop_create.cc @@ -84,7 +84,7 @@ template< std::unique_ptr<IDProperty, IDPropertyDeleter> create_array(StringRefNull prop_name, Span<PrimitiveType> values) { - static_assert(std::is_same_v<PrimitiveType, int32_t> || std::is_same_v<PrimitiveType, float_t> || + static_assert(std::is_same_v<PrimitiveType, int32_t> || std::is_same_v<PrimitiveType, float> || std::is_same_v<PrimitiveType, double>, "Allowed values for PrimitiveType are int32_t, float and double."); static_assert(!std::is_same_v<PrimitiveType, int32_t> || id_property_subtype == IDP_INT, |