Commit: 248ee40712ea7f1fcb6dc2ef03fdac21a5acb13f Author: Lazydodo Date: Thu Jul 25 15:18:33 2019 -0600 Branches: functions https://developer.blender.org/rB248ee40712ea7f1fcb6dc2ef03fdac21a5acb13f
Cleanup: Fix build error with msvc. =================================================================== M source/blender/blenkernel/BKE_node_tree.hpp M source/blender/blenlib/BLI_string_ref.hpp =================================================================== diff --git a/source/blender/blenkernel/BKE_node_tree.hpp b/source/blender/blenkernel/BKE_node_tree.hpp index 84a761f4d0a..d97e35eac5a 100644 --- a/source/blender/blenkernel/BKE_node_tree.hpp +++ b/source/blender/blenkernel/BKE_node_tree.hpp @@ -127,12 +127,11 @@ class VirtualLink; class VirtualNodeTree { private: bool m_frozen = false; - MonotonicAllocator<> m_allocator; Vector<VirtualNode *> m_nodes; Vector<VirtualLink *> m_links; Vector<VirtualSocket *> m_inputs_with_links; MultiMap<std::string, VirtualNode *> m_nodes_by_idname; - + MonotonicAllocator<> m_allocator; public: void add_all_of_tree(bNodeTree *btree); VirtualNode *add_bnode(bNodeTree *btree, bNode *bnode); diff --git a/source/blender/blenlib/BLI_string_ref.hpp b/source/blender/blenlib/BLI_string_ref.hpp index 6749dddf5a1..65affae159b 100644 --- a/source/blender/blenlib/BLI_string_ref.hpp +++ b/source/blender/blenlib/BLI_string_ref.hpp @@ -229,7 +229,7 @@ inline bool StringRefBase::endswith(StringRef suffix) const BLI::StringRef a_ref(a); \ BLI::StringRef b_ref(b); \ uint characters = a_ref.size() + b_ref.size(); \ - char *result##_ptr = BLI_array_alloca(result##_ptr, characters + 1); \ + char *result##_ptr = (char*) BLI_array_alloca(result##_ptr, characters + 1); \ for (uint i = 0; i < a_ref.size(); i++) \ result##_ptr[i] = a_ref[i]; \ for (uint i = 0; i < b_ref.size(); i++) \ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs