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

BLEN-299: Export instances #11

Merged
Bogdan Nagirniak merged 7 commits from BLEN-299 into hydra-render 2023-03-05 09:37:12 +01:00
Conversation 0 Commits 7 Files Changed 7 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 26d65e5ce9 - Show all commits

4
source/blender/render/hydra/sceneDelegate/blenderSceneDelegate.cc
View File

@ -165,7 +165,7 @@ void BlenderSceneDelegate::update_collection(bool remove, bool visibility)
DEG_iterator_objects_end, DEG_iterator_objects_end,
&data, Object *, object) { &data, Object *, object) {
if (data.dupli_object_current != nullptr) { if (data.dupli_object_current != nullptr) {
add_update_instance(data.dupli_object_current, false); add_update_instance(data.dupli_object_current);
continue; continue;
} }
@ -251,7 +251,7 @@ void BlenderSceneDelegate::add_update_object(Object *object, bool geometry, bool
} }
} }
void BlenderSceneDelegate::add_update_instance(DupliObject *dupli, bool transform) void BlenderSceneDelegate::add_update_instance(DupliObject *dupli)
{ {
SdfPath id = ObjectData::prim_id(this, dupli->ob); SdfPath id = ObjectData::prim_id(this, dupli->ob);
if (!object_data(id)) { if (!object_data(id)) {

4
source/blender/render/hydra/sceneDelegate/blenderSceneDelegate.h
View File

@ -48,14 +48,14 @@ public:
EngineType engine_type; EngineType engine_type;
private: private:
ObjectData *object_data(pxr::SdfPath const &id); ObjectData *object_data(pxr::SdfPath const &id);
MeshData *mesh_data(pxr::SdfPath const &id); MeshData *mesh_data(pxr::SdfPath const &id);
LightData *light_data(pxr::SdfPath const &id); LightData *light_data(pxr::SdfPath const &id);
MaterialData *material_data(pxr::SdfPath const &id); MaterialData *material_data(pxr::SdfPath const &id);
void add_update_object(Object *object, bool geometry, bool transform, bool shading); void add_update_object(Object *object, bool geometry, bool transform, bool shading);
void add_update_instance(DupliObject *dupli, bool transform); void add_update_instance(DupliObject *dupli);
void set_material(MeshData &mesh_data); void set_material(MeshData &mesh_data);
void update_material(Material *material); void update_material(Material *material);
void update_world(); void update_world();