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

Support multimaterials on one mesh #44

Merged
Bogdan Nagirniak merged 11 commits from BLEN-417 into hydra-render 2023-05-24 07:07:39 +02:00
Conversation 0 Commits 11 Files Changed 5 +270 -211
Bogdan Nagirniak commented 2023-05-20 21:19:29 +02:00
Owner
Copy Link

Purpose

Hydra doesn't support multimaterials assigned to one mesh, therefore we have to split mesh to submeshes with one material.

Technical steps

  1. Changed structure of MeshData to support submeshes for one material:
    • added MeshData::SubMesh
    • moved mesh export to write_submeshes()
    • implemented more correct material assignment.
  2. Adjusted InstancerData due to submeshes in MeshData.
  3. Adjusted BlenderSceneDelegate.
### Purpose Hydra doesn't support multimaterials assigned to one mesh, therefore we have to split mesh to submeshes with one material. ### Technical steps 1. Changed structure of `MeshData` to support submeshes for one material: - added `MeshData::SubMesh` - moved mesh export to `write_submeshes()` - implemented more correct material assignment. 2. Adjusted `InstancerData` due to submeshes in `MeshData`. 3. Adjusted `BlenderSceneDelegate`.
Bogdan Nagirniak added 10 commits 2023-05-20 21:19:49 +02:00
Bogdan Nagirniak requested review from Brian Savery (AMD) 2023-05-20 21:20:24 +02:00
Bogdan Nagirniak requested review from Georgiy Markelov 2023-05-20 21:20:24 +02:00
Bogdan Nagirniak requested review from Vasyl Pidhirskyi 2023-05-20 21:20:24 +02:00
Brian Savery (AMD) was assigned by Bogdan Nagirniak 2023-05-20 21:20:31 +02:00
Georgiy Markelov was assigned by Bogdan Nagirniak 2023-05-20 21:20:31 +02:00
Bogdan Nagirniak self-assigned this 2023-05-20 21:20:31 +02:00
Vasyl Pidhirskyi was assigned by Bogdan Nagirniak 2023-05-20 21:20:32 +02:00
Georgiy Markelov approved these changes 2023-05-22 14:54:11 +02:00
Georgiy Markelov left a comment
Collaborator
Copy Link

Works fine. Some comments in code.

Works fine. Some comments in code.
source/blender/render/hydra/scene_delegate/blender_scene_delegate.cc Outdated
@ -241,3 +245,3 @@
ObjectData *BlenderSceneDelegate::object_data(pxr::SdfPath const &id) const
{
auto it = objects_.find(id);
pxr::SdfPath p_id = (id.GetName().find("SM_", 0) == 0) ? id.GetParentPath() : id;
Georgiy Markelov commented 2023-05-22 14:08:07 +02:00
Collaborator
Copy Link

id.GetName().find("SM_")

`id.GetName().find("SM_")`
source/blender/render/hydra/scene_delegate/mesh.cc
@ -41,3 +41,3 @@
write_material();
write_transform();
write_materials();
Georgiy Markelov commented 2023-05-22 14:30:54 +02:00
Collaborator
Copy Link

The order is important here?

The order is important here?
Bogdan Nagirniak commented 2023-05-22 15:15:05 +02:00
Author
Owner
Copy Link

No

No
Vasyl Pidhirskyi approved these changes 2023-05-22 16:02:29 +02:00
Vasyl Pidhirskyi left a comment
Collaborator
Copy Link

Works well.

Works well.
Bogdan Nagirniak added 1 commit 2023-05-22 20:44:29 +02:00
Brian Savery (AMD) approved these changes 2023-05-24 01:54:17 +02:00
Bogdan Nagirniak merged commit 3f7774c002 into hydra-render 2023-05-24 07:07:39 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Georgiy Markelov
Vasyl Pidhirskyi
Brian Savery (AMD)
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
Brian Savery (AMD)
Bogdan Nagirniak
Vasyl Pidhirskyi
4 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: BogdanNagirniak/blender#44
No description provided.
Delete Branch "BLEN-417"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?