BogdanNagirniak/blender
0
0
Fork 3
forked from blender/blender
Code Pull Requests Activity

Fixing build on MacOS #39

Merged
Bogdan Nagirniak merged 1 commits from macos-build-fix into hydra-render 2023-05-11 09:12:04 +02:00
Conversation 1 Commits 1 Files Changed 6 +19 -10
6 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/render/hydra/engine.h
View File

@ -21,7 +21,7 @@
namespace blender::render::hydra { namespace blender::render::hydra {
extern struct CLG_LogRef *LOG_RENDER_HYDRA; /* EN - Engine */ extern struct CLG_LogRef *LOG_RENDER_HYDRA;
class Engine { class Engine {
public: public:

3
source/blender/render/hydra/scene_delegate/blender_scene_delegate.h
View File

@ -3,6 +3,7 @@
#pragma once #pragma once
#include <pxr/base/gf/vec2f.h>
#include <pxr/imaging/hd/sceneDelegate.h> #include <pxr/imaging/hd/sceneDelegate.h>
#include "BKE_context.h" #include "BKE_context.h"
@ -18,7 +19,7 @@
namespace blender::render::hydra { namespace blender::render::hydra {
extern struct CLG_LogRef *LOG_RENDER_HYDRA_SCENE; /* BSD - Blender Scene Delegate */ extern struct CLG_LogRef *LOG_RENDER_HYDRA_SCENE;
class BlenderSceneDelegate : public pxr::HdSceneDelegate { class BlenderSceneDelegate : public pxr::HdSceneDelegate {
friend ObjectData; /* has access to instances */ friend ObjectData; /* has access to instances */

10
source/blender/render/hydra/scene_delegate/id.h
View File

@ -5,7 +5,7 @@
#include <pxr/base/tf/token.h> #include <pxr/base/tf/token.h>
#include <pxr/base/vt/value.h> #include <pxr/base/vt/value.h>
#include <pxr/imaging/hd/sceneDelegate.h> #include <pxr/usd/sdf/path.h>
#include "DNA_ID.h" #include "DNA_ID.h"
@ -39,7 +39,11 @@ template<class T> const T IdData::get_data(pxr::TfToken const &key) const
} }
#define ID_LOG(level, msg, ...) \ #define ID_LOG(level, msg, ...) \
CLOG_INFO( \ CLOG_INFO(LOG_RENDER_HYDRA_SCENE, \
LOG_RENDER_HYDRA_SCENE, level, "%s (%s): " msg, prim_id.GetText(), id->name, __VA_ARGS__); level, \
"%s (%s): " msg, \
prim_id.GetText(), \
id->name, \
##__VA_ARGS__);
} // namespace blender::render::hydra } // namespace blender::render::hydra

2
source/blender/render/hydra/scene_delegate/instancer.cc
View File

@ -246,7 +246,7 @@ pxr::SdfPath InstancerData::light_prim_id(LightInstance const &inst, int index)
int InstancerData::light_prim_id_index(pxr::SdfPath const &id) const int InstancerData::light_prim_id_index(pxr::SdfPath const &id) const
{ {
int index; int index;
sscanf_s(id.GetName().c_str(), "L_%x", &index); sscanf(id.GetName().c_str(), "L_%x", &index);
return index; return index;
} }

4
source/blender/render/hydra/scene_delegate/mtlx_hydra_adapter.cc
View File

@ -22,6 +22,8 @@
namespace mx = MaterialX; namespace mx = MaterialX;
namespace blender::render::hydra {
void hdmtlx_convert_to_materialnetworkmap(std::string const &mtlx_path, void hdmtlx_convert_to_materialnetworkmap(std::string const &mtlx_path,
pxr::TfTokenVector const &shader_source_types, pxr::TfTokenVector const &shader_source_types,
pxr::TfTokenVector const &render_contexts, pxr::TfTokenVector const &render_contexts,
@ -77,3 +79,5 @@ void hdmtlx_convert_to_materialnetworkmap(std::string const &mtlx_path,
} }
} }
} }
} // namespace blender::render::hydra

8
source/blender/render/hydra/scene_delegate/mtlx_hydra_adapter.h
View File

@ -4,13 +4,13 @@
#pragma once #pragma once
#include <pxr/base/tf/token.h> #include <pxr/base/tf/token.h>
#include <pxr/pxr.h> #include <pxr/imaging/hd/material.h>
#include <string> namespace blender::render::hydra {
struct pxr::HdMaterialNetworkMap;
void hdmtlx_convert_to_materialnetworkmap(std::string const &mtlx_path, void hdmtlx_convert_to_materialnetworkmap(std::string const &mtlx_path,
pxr::TfTokenVector const &shader_source_types, pxr::TfTokenVector const &shader_source_types,
pxr::TfTokenVector const &render_contexts, pxr::TfTokenVector const &render_contexts,
pxr::HdMaterialNetworkMap *out); pxr::HdMaterialNetworkMap *out);
} // namespace blender::render::hydra