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

Fix visibility of instancer object #43

Merged
Bogdan Nagirniak merged 16 commits from BLEN-405_1 into hydra-render 2023-05-24 13:44:35 +02:00
Conversation 2 Commits 16 Files Changed 5 +18 -41
2 changed files with 18 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e6874d2199 - Show all commits

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

@ -38,16 +38,23 @@ bool InstancerData::is_supported(Object *object)
bool InstancerData::is_visible(BlenderSceneDelegate *scene_delegate, Object *object) bool InstancerData::is_visible(BlenderSceneDelegate *scene_delegate, Object *object)
{ {
bool ret = true;
eEvaluationMode deg_mode = DEG_get_mode(scene_delegate->depsgraph); eEvaluationMode deg_mode = DEG_get_mode(scene_delegate->depsgraph);
int vis = BKE_object_visibility(object, deg_mode); int vis = BKE_object_visibility(object, deg_mode);
bool ret = vis & OB_VISIBLE_INSTANCES;
if (deg_mode == DAG_EVAL_VIEWPORT) { if (deg_mode == DAG_EVAL_VIEWPORT) {
ret = BKE_object_is_visible_in_viewport(scene_delegate->view3d, object) && ret &= BKE_object_is_visible_in_viewport(scene_delegate->view3d, object);
(vis & OB_VISIBLE_INSTANCES);
} }
else { else {
vis = BKE_object_visibility(object, deg_mode); if (ret) {
ret = vis & (OB_VISIBLE_SELF | OB_VISIBLE_INSTANCES); /* If some of parent object is instancer, then currenct object as instancer
* is invisible in Final render */
for (Object *ob = object->parent; ob != nullptr; ob = ob->parent) {
if (ob->transflag & OB_DUPLI) {
ret = false;
break;
}
}
}
} }
return ret; return ret;
} }
@ -261,31 +268,8 @@ void InstancerData::update_double_sided(MaterialData *mat_data)
bool InstancerData::is_instance_visible(Object *object) bool InstancerData::is_instance_visible(Object *object)
{ {
bool ret = true; int vis = BKE_object_visibility(object, DEG_get_mode(scene_delegate_->depsgraph));
eEvaluationMode deg_mode = DEG_get_mode(scene_delegate_->depsgraph); return vis & OB_VISIBLE_SELF;
int vis = BKE_object_visibility(object, deg_mode);
if (deg_mode == DAG_EVAL_VIEWPORT) {
ret = vis & OB_VISIBLE_SELF;
//if (ret && object->transflag & OB_DUPLI) {
// ret = object->duplicator_visibility_flag & OB_DUPLI_FLAG_VIEWPORT;
//}
}
else {
ret = vis & OB_VISIBLE_SELF;
if (ret && object->transflag & OB_DUPLI) {
ret = object->duplicator_visibility_flag & OB_DUPLI_FLAG_RENDER;
}
//if (ret) {
// /* If some of parent object is instacer, then object is invisible in Final render */
// for (Object *ob = object->parent; ob != nullptr; ob = ob->parent) {
// if (ob->transflag & OB_DUPLI) {
// ret = false;
// break;
// }
// }
//}
}
return ret;
} }
pxr::SdfPath InstancerData::object_prim_id(Object *object) const pxr::SdfPath InstancerData::object_prim_id(Object *object) const

15
source/blender/render/hydra/scene_delegate/object.cc
View File

@ -62,23 +62,16 @@ bool ObjectData::is_supported(Object *object)
bool ObjectData::is_visible(BlenderSceneDelegate *scene_delegate, Object *object) bool ObjectData::is_visible(BlenderSceneDelegate *scene_delegate, Object *object)
{ {
bool ret = true;
eEvaluationMode deg_mode = DEG_get_mode(scene_delegate->depsgraph); eEvaluationMode deg_mode = DEG_get_mode(scene_delegate->depsgraph);
int vis = BKE_object_visibility(object, deg_mode); int vis = BKE_object_visibility(object, deg_mode);
bool ret = vis & OB_VISIBLE_SELF;
if (deg_mode == DAG_EVAL_VIEWPORT) { if (deg_mode == DAG_EVAL_VIEWPORT) {
ret = BKE_object_is_visible_in_viewport(scene_delegate->view3d, object) && ret &= BKE_object_is_visible_in_viewport(scene_delegate->view3d, object);
(vis & OB_VISIBLE_SELF);
//if (ret && object->transflag & OB_DUPLI) {
// ret = object->duplicator_visibility_flag & OB_DUPLI_FLAG_VIEWPORT;
//}
} }
else { else {
ret = vis & OB_VISIBLE_SELF;
if (ret && object->transflag & OB_DUPLI) {
ret = object->duplicator_visibility_flag & OB_DUPLI_FLAG_RENDER;
}
if (ret) { if (ret) {
/* If some of parent object is instacer, then object is invisible in Final render */ /* If some of parent object is instancer, then currenct object
* is invisible in Final render */
for (Object *ob = object->parent; ob != nullptr; ob = ob->parent) { for (Object *ob = object->parent; ob != nullptr; ob = ob->parent) {
if (ob->transflag & OB_DUPLI) { if (ob->transflag & OB_DUPLI) {
ret = false; ret = false;