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

BLEN-299: Export instances #11

Merged
Bogdan Nagirniak merged 7 commits from BLEN-299 into hydra-render 2023-03-05 09:37:12 +01:00
Conversation 0 Commits 7 Files Changed 7 +2 -4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d93badf527 - Show all commits

3
source/blender/render/hydra/sceneDelegate/material.cc
View File

@ -31,8 +31,7 @@ pxr::SdfPath MaterialData::prim_id(BlenderSceneDelegate *scene_delegate, Materia
* Example: M_000002074e812088 */ * Example: M_000002074e812088 */
char str[32]; char str[32];
snprintf(str, 32, "M_%016llx", (uint64_t)material); snprintf(str, 32, "M_%016llx", (uint64_t)material);
//return scene_delegate->GetDelegateID().AppendElementString(str); return scene_delegate->GetDelegateID().AppendElementString(str);
return scene_delegate->GetDelegateID().AppendElementString(((ID *)material)->name);
} }
MaterialData::MaterialData(BlenderSceneDelegate *scene_delegate, Material *material) MaterialData::MaterialData(BlenderSceneDelegate *scene_delegate, Material *material)

3
source/blender/render/hydra/sceneDelegate/object.cc
View File

@ -57,8 +57,7 @@ pxr::SdfPath ObjectData::prim_id(BlenderSceneDelegate *scene_delegate, Object *o
* O_000002073e369608 */ * O_000002073e369608 */
char str[32]; char str[32];
snprintf(str, 32, "O_%016llx", (uint64_t)object); snprintf(str, 32, "O_%016llx", (uint64_t)object);
//return scene_delegate->GetDelegateID().AppendElementString(str); return scene_delegate->GetDelegateID().AppendElementString(str);
return scene_delegate->GetDelegateID().AppendElementString(((ID *)object)->name);
} }
ObjectData::ObjectData(BlenderSceneDelegate *scene_delegate, Object *object) ObjectData::ObjectData(BlenderSceneDelegate *scene_delegate, Object *object)