griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Build: USD: Small change to allow compiling against both 24.05 and 24.11

Browse Source 
Handle the different boost python namespaces in the very recently added
code from `0df5d8220b4`

Pull Request: https://projects.blender.org/blender/blender/pulls/131817
This commit is contained in:
Jesse Yurkovich
2024-12-12 21:00:42 +01:00
committed by Jesse Yurkovich
parent 81f9df606a
commit 7eefbd1178
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/io/usd/intern/usd_hook.cc
View File

@@ -23,11 +23,14 @@
#if PXR_VERSION >= 2411
# include <pxr/external/boost/python/call_method.hpp>
# include <pxr/external/boost/python/class.hpp>
# include <pxr/external/boost/python/dict.hpp>
# include <pxr/external/boost/python/import.hpp>
# include <pxr/external/boost/python/list.hpp>
# include <pxr/external/boost/python/ref.hpp>
# include <pxr/external/boost/python/return_value_policy.hpp>
# include <pxr/external/boost/python/to_python_converter.hpp>
# define REF python::ref
# define PYTHON_NS pxr::pxr_boost::python
# define REF pxr::pxr_boost::python::ref
using namespace pxr::pxr_boost;
#else
@@ -36,6 +39,7 @@ using namespace pxr::pxr_boost;
# include <boost/python/import.hpp>
# include <boost/python/return_value_policy.hpp>
# include <boost/python/to_python_converter.hpp>
# define PYTHON_NS boost::python
# define REF boost::ref
using namespace boost;
@@ -140,17 +144,16 @@ struct USDSceneImportContext {
return stage;
}
boost::python::dict get_prim_map()
PYTHON_NS::dict get_prim_map()
{
if (!prim_map_dict) {
prim_map_dict = new boost::python::dict;
prim_map_dict = new PYTHON_NS::dict;
prim_map.foreach_item([&](const std::string &path, const Vector<PointerRNA> &ids) {
if (!prim_map_dict->has_key(path)) {
(*prim_map_dict)[path] = boost::python::list();
(*prim_map_dict)[path] = PYTHON_NS::list();
}
boost::python::list list = boost::python::extract<boost::python::list>(
(*prim_map_dict)[path]);
PYTHON_NS::list list = PYTHON_NS::extract<PYTHON_NS::list>((*prim_map_dict)[path]);
for (auto &ptr_rna : ids) {
list.append(ptr_rna);
@@ -163,7 +166,7 @@ struct USDSceneImportContext {
pxr::UsdStageRefPtr stage;
ImportedPrimMap prim_map;
boost::python::dict *prim_map_dict = nullptr;
PYTHON_NS::dict *prim_map_dict = nullptr;
};
/* Encapsulate arguments for material export. */
@@ -426,3 +429,4 @@ void call_import_hooks(pxr::UsdStageRefPtr stage,
} // namespace blender::io::usd
#undef REF
#undef PYTHON_NS