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

Fix rendering of Car Demo scene #37

Merged
Bogdan Nagirniak merged 2 commits from Vasyl-Pidhirskyi/blender_bn:BLEN-399 into hydra-render 2023-05-05 20:55:52 +02:00
Conversation 0 Commits 2 Files Changed 2 +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

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

@ -434,10 +434,6 @@ void BlenderSceneDelegate::add_new_objects()
Object *, Object *,
object) { object) {
if (!ObjectData::is_supported(object)) {
continue;
}
update_objects(object); update_objects(object);
update_instancers(object); update_instancers(object);
} }
@ -462,10 +458,9 @@ void BlenderSceneDelegate::remove_unused_objects()
&data, &data,
Object *, Object *,
object) { object) {
if (!ObjectData::is_supported(object)) { if (ObjectData::is_supported(object)) {
continue;
}
available_objects.insert(object_prim_id(object).GetName()); available_objects.insert(object_prim_id(object).GetName());
}
available_objects.insert(instancer_prim_id(object).GetName()); available_objects.insert(instancer_prim_id(object).GetName());
} }
ITER_END; ITER_END;
@ -542,10 +537,6 @@ void BlenderSceneDelegate::update_visibility()
Object *, Object *,
object) { object) {
if (!ObjectData::is_supported(object)) {
continue;
}
if (!object_data(object_prim_id(object))) { if (!object_data(object_prim_id(object))) {
update_objects(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, ""); ID_LOG(2, "");
Object *object = (Object *)id; 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) { id->recalc & ID_RECALC_TRANSFORM) {
set_instances(); set_instances();
scene_delegate_->GetRenderIndex().GetChangeTracker().MarkInstancerDirty( scene_delegate_->GetRenderIndex().GetChangeTracker().MarkInstancerDirty(