[Bf-blender-cvs] [76655021c2e] functions-experimental-refactor: remove unused code
Jacques Lucke
noreply at git.blender.org
Wed Oct 16 13:17:45 CEST 2019
Commit: 76655021c2e26d3c68ae853198a2575862bb3ae7
Author: Jacques Lucke
Date: Wed Oct 16 12:19:22 2019 +0200
Branches: functions-experimental-refactor
https://developer.blender.org/rB76655021c2e26d3c68ae853198a2575862bb3ae7
remove unused code
===================================================================
D source/blender/blenkernel/BKE_function_nodes_data_types.h
M source/blender/blenkernel/CMakeLists.txt
D source/blender/blenkernel/intern/function_nodes_data_types.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_function_nodes_data_types.h b/source/blender/blenkernel/BKE_function_nodes_data_types.h
deleted file mode 100644
index b6581084501..00000000000
--- a/source/blender/blenkernel/BKE_function_nodes_data_types.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef __BKE_FUNCTION_NODES_DATA_TYPES_H__
-#define __BKE_FUNCTION_NODES_DATA_TYPES_H__
-
-#include "BKE_cpp_types.h"
-
-#include "BLI_string_map.h"
-
-namespace BKE {
-
-using BLI::StringMap;
-
-enum DataTypeCategory {
- Single,
- List,
-};
-
-struct SocketDataType {
- CPPType *type;
- DataTypeCategory category;
-
- static SocketDataType none_type()
- {
- return {nullptr, DataTypeCategory::Single};
- }
-};
-
-StringMap<SocketDataType> &get_function_nodes_data_types();
-
-}; // namespace BKE
-
-#endif /* __BKE_FUNCTION_NODES_DATA_TYPES_H__ */
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index c3f60419162..07fc44c36e5 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -120,7 +120,6 @@ set(SRC
intern/fmodifier.c
intern/font.c
intern/freestyle.c
- intern/function_nodes_data_types.cc
intern/generic_array_ref.cc
intern/gpencil.c
intern/gpencil_modifier.c
diff --git a/source/blender/blenkernel/intern/function_nodes_data_types.cc b/source/blender/blenkernel/intern/function_nodes_data_types.cc
deleted file mode 100644
index 716c1ba2f5a..00000000000
--- a/source/blender/blenkernel/intern/function_nodes_data_types.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "BLI_lazy_init_cxx.h"
-#include "BLI_math_cxx.h"
-
-#include "BKE_function_nodes_data_types.h"
-
-#include "DNA_object_types.h"
-
-namespace BKE {
-
-void insert_single_and_list_type(StringMap<SocketDataType> &types, StringRef name, CPPType &type)
-{
- std::string base_idname = "fn_" + name + "Socket";
- std::string list_idname = "fn_" + name + "ListSocket";
-
- types.add_new(base_idname, {&type, DataTypeCategory::Single});
- types.add_new(list_idname, {&type, DataTypeCategory::List});
-}
-
-BLI_LAZY_INIT(StringMap<SocketDataType>, get_function_nodes_data_types)
-{
- StringMap<SocketDataType> types;
-
- insert_single_and_list_type(types, "Boolean", GET_TYPE<bool>());
- insert_single_and_list_type(types, "Color", GET_TYPE<BLI::rgba_f>());
- insert_single_and_list_type(types, "Float", GET_TYPE<float>());
- insert_single_and_list_type(types, "Integer", GET_TYPE<int32_t>());
- insert_single_and_list_type(types, "Object", GET_TYPE<Object *>());
- insert_single_and_list_type(types, "Text", GET_TYPE<std::string>());
- insert_single_and_list_type(types, "Vector", GET_TYPE<BLI::float3>());
-
- return types;
-}
-
-} // namespace BKE
\ No newline at end of file
More information about the Bf-blender-cvs
mailing list