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

Fix review comments #51

Merged
Bogdan Nagirniak merged 15 commits from BLEN-430 into hydra-render 2023-06-08 18:10:55 +02:00
Conversation 0 Commits 15 Files Changed 13 +9 -8
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ec7212792f - Show all commits

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

@ -241,9 +241,9 @@ void BlenderSceneDelegate::set_setting(const std::string &key, const pxr::VtValu
pxr::SdfPath BlenderSceneDelegate::prim_id(ID *id, const char *prefix) const pxr::SdfPath BlenderSceneDelegate::prim_id(ID *id, const char *prefix) const
{ {
/* Making id of object in form like <prefix>_<pointer in 16 hex digits format> */ /* Making id of object in form like <prefix>_<pointer in 16 hex digits format> */
char str[32]; char name[32];
snprintf(str, 32, "%s_%016llx", prefix, (uintptr_t)id); snprintf(name, sizeof(name), "%s_%016llx", prefix, (uintptr_t)id);
return GetDelegateID().AppendElementString(str); return GetDelegateID().AppendElementString(name);
} }
pxr::SdfPath BlenderSceneDelegate::object_prim_id(Object *object) const pxr::SdfPath BlenderSceneDelegate::object_prim_id(Object *object) const

1
source/blender/render/hydra/scene_delegate/curves.cc
View File

@ -184,6 +184,7 @@ void CurvesData::write_material()
{ {
Object *object = (Object *)id; Object *object = (Object *)id;
Material *mat = nullptr; Material *mat = nullptr;
/* TODO: Using only first material. Add support for multimaterial. */
if (BKE_object_material_count_eval(object) > 0) { if (BKE_object_material_count_eval(object) > 0) {
DagerD marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-06-06 14:37:33 +02:00
Outdated
Review
Copy Link

Add comment here about using first material and TODO about support multimaterial

Add comment here about using first material and TODO about support multimaterial
mat = BKE_object_material_get_eval(object, 0); mat = BKE_object_material_get_eval(object, 0);
} }

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

@ -319,15 +319,15 @@ bool InstancerData::is_instance_visible(Object *object)
pxr::SdfPath InstancerData::object_prim_id(Object *object) const pxr::SdfPath InstancerData::object_prim_id(Object *object) const
{ {
/* Making id of object in form like <prefix>_<pointer in 16 hex digits format> */ /* Making id of object in form like <prefix>_<pointer in 16 hex digits format> */
char str[32]; char name[32];
snprintf(str, 32, "O_%016llx", (uint64_t)object); snprintf(name, sizeof(name), "O_%016llx", (uint64_t)object);
return prim_id.AppendElementString(str); return prim_id.AppendElementString(name);
} }
pxr::SdfPath InstancerData::light_prim_id(LightInstance const &inst, int index) const pxr::SdfPath InstancerData::light_prim_id(LightInstance const &inst, int index) const
{ {
char name[16]; char name[16];
snprintf(name, 16, "L_%08x", index); snprintf(name, sizeof(name), "L_%08x", index);
return inst.data->prim_id.AppendElementString(name); return inst.data->prim_id.AppendElementString(name);
} }

2
source/blender/render/hydra/scene_delegate/mesh.cc
View File

@ -186,7 +186,7 @@ pxr::SdfPathVector MeshData::submesh_paths() const
pxr::SdfPath MeshData::submesh_prim_id(int index) const pxr::SdfPath MeshData::submesh_prim_id(int index) const
{ {
char name[16]; char name[16];
snprintf(name, 16, "SM_%04x", index); snprintf(name, sizeof(name), "SM_%04x", index);
return prim_id.AppendElementString(name); return prim_id.AppendElementString(name);
} }