blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Hydra render engine #104712

Closed
Bogdan Nagirniak wants to merge 142 commits from BogdanNagirniak/blender:hydra-render into main
pull from: BogdanNagirniak/blender:hydra-render
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 31 Commits 142 Files Changed 65 +4 -12
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1dd88bd713 - Show all commits

13
source/blender/render/hydra/scene_delegate/blender_scene_delegate.cc
View File

@ -441,10 +441,6 @@ void BlenderSceneDelegate::add_new_objects()
Object *,
object) {
if (!ObjectData::is_supported(object)) {
continue;
}
update_objects(object);
update_instancers(object);
}
@ -469,10 +465,9 @@ void BlenderSceneDelegate::remove_unused_objects()
&data,
Object *,
object) {
if (!ObjectData::is_supported(object)) {
continue;
if (ObjectData::is_supported(object)) {
available_objects.insert(object_prim_id(object).GetName());
}
available_objects.insert(object_prim_id(object).GetName());
available_objects.insert(instancer_prim_id(object).GetName());
}
ITER_END;
@ -549,10 +544,6 @@ void BlenderSceneDelegate::update_visibility()
Object *,
object) {
if (!ObjectData::is_supported(object)) {
continue;
}
if (!object_data(object_prim_id(object))) {
update_objects(object);
}

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

@ -64,7 +64,8 @@ void InstancerData::update()
ID_LOG(2, "");
Object *object = (Object *)id;
if (id->recalc & ID_RECALC_GEOMETRY || ((ID *)object->data)->recalc & ID_RECALC_GEOMETRY ||
if (id->recalc & ID_RECALC_GEOMETRY ||
(object->data && ((ID *)object->data)->recalc & ID_RECALC_GEOMETRY) ||
id->recalc & ID_RECALC_TRANSFORM) {
set_instances();
scene_delegate_->GetRenderIndex().GetChangeTracker().MarkInstancerDirty(