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

IBL has a wrong coordinates in render #85

Merged
Bogdan Nagirniak merged 1 commits from Vasyl-Pidhirskyi/blender_bn:BLEN-483 into hydra-render 2023-08-03 17:20:15 +02:00
Conversation 0 Commits 1 Files Changed 3 +4 -8
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c10ebcac3b - Show all commits

3
source/blender/io/usd/hydra/hydra_scene_delegate.cc
View File

@ -61,9 +61,6 @@ pxr::GfMatrix4d HydraSceneDelegate::GetTransform(pxr::SdfPath const &id)
if (obj_data) { if (obj_data) {
return obj_data->transform; return obj_data->transform;
} }
if (id == world_prim_id()) {
return world_data_->transform;
}
return pxr::GfMatrix4d(); return pxr::GfMatrix4d();
} }

7
source/blender/io/usd/hydra/object.h
View File

@ -20,6 +20,10 @@
namespace blender::io::hydra { namespace blender::io::hydra {
class ObjectData : public IdData { class ObjectData : public IdData {
public:
pxr::GfMatrix4d transform;
bool visible = true;
public: public:
ObjectData(HydraSceneDelegate *scene_delegate, Object *object, pxr::SdfPath const &prim_id); ObjectData(HydraSceneDelegate *scene_delegate, Object *object, pxr::SdfPath const &prim_id);
@ -38,9 +42,6 @@ class ObjectData : public IdData {
virtual pxr::SdfPath material_id(pxr::SdfPath const &id) const; virtual pxr::SdfPath material_id(pxr::SdfPath const &id) const;
virtual void available_materials(Set<pxr::SdfPath> &paths) const; virtual void available_materials(Set<pxr::SdfPath> &paths) const;
pxr::GfMatrix4d transform;
bool visible = true;
protected: protected:
virtual void write_transform(); virtual void write_transform();
virtual void write_materials(); virtual void write_materials();

2
source/blender/io/usd/hydra/world.h
View File

@ -20,8 +20,6 @@ namespace blender::io::hydra {
class WorldData : public LightData { class WorldData : public LightData {
public: public:
pxr::GfMatrix4d transform;
WorldData(HydraSceneDelegate *scene_delegate, pxr::SdfPath const &prim_id); WorldData(HydraSceneDelegate *scene_delegate, pxr::SdfPath const &prim_id);
void init() override; void init() override;