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

BLEN-351: Test/fix Hydra addon with different blender scenes #13

Merged
Bogdan Nagirniak merged 4 commits from BLEN-351 into hydra-render 2023-03-10 17:16:57 +01:00
Conversation 0 Commits 4 Files Changed 4 +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 28ca9781e9 - Show all commits

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

@ -164,12 +164,13 @@ void BlenderSceneDelegate::update_collection(bool remove, bool visibility)
DEG_iterator_objects_next, DEG_iterator_objects_next,
DEG_iterator_objects_end, DEG_iterator_objects_end,
&data, Object *, object) { &data, Object *, object) {
if (data.dupli_object_current != nullptr) {
add_update_instance(data.dupli_object_current); if (!ObjectData::supported(object)) {
continue; continue;
} }
if (!ObjectData::supported(object)) { if (data.dupli_object_current != nullptr) {
add_update_instance(data.dupli_object_current);
continue; continue;
} }

1
source/blender/render/hydra/sceneDelegate/object.cc
View File

@ -19,7 +19,6 @@ bool ObjectData::supported(Object *object)
case OB_MESH: case OB_MESH:
case OB_SURF: case OB_SURF:
case OB_FONT: case OB_FONT:
case OB_CURVES:
case OB_CURVES_LEGACY: case OB_CURVES_LEGACY:
case OB_MBALL: case OB_MBALL:
case OB_LAMP: case OB_LAMP: