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

Rename some functions #25

Merged
Bogdan Nagirniak merged 13 commits from BLEN-388 into hydra-render 2023-04-18 09:07:35 +02:00
Conversation 0 Commits 13 Files Changed 33 +3 -6
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 816f141e7d - Show all commits

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

@ -86,8 +86,7 @@ void BlenderSceneDelegate::populate(Depsgraph *deps, bContext *cont)
} break; } break;
case ID_MA: { case ID_MA: {
MaterialData *mat_data = material_data( MaterialData *mat_data = material_data(MaterialData::prim_id(this, (Material *)id));
MaterialData::prim_id(this, (Material *)id));
if (mat_data) { if (mat_data) {
mat_data->update(); mat_data->update();
} }

3
source/blender/render/hydra/scene_delegate/instancer.h
View File

@ -27,8 +27,7 @@ class InstancerData : public MeshData {
pxr::GfMatrix4d transform() override; pxr::GfMatrix4d transform() override;
bool update_visibility(View3D *view3d) override; bool update_visibility(View3D *view3d) override;
pxr::HdPrimvarDescriptorVector instancer_primvar_descriptors( pxr::HdPrimvarDescriptorVector instancer_primvar_descriptors(pxr::HdInterpolation interpolation);
pxr::HdInterpolation interpolation);
pxr::VtIntArray instance_indices(); pxr::VtIntArray instance_indices();
bool is_base(Object *object) const; bool is_base(Object *object) const;

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

@ -134,8 +134,7 @@ pxr::HdMeshTopology MeshData::mesh_topology()
face_vertex_indices_); face_vertex_indices_);
} }
pxr::HdPrimvarDescriptorVector MeshData::primvar_descriptors( pxr::HdPrimvarDescriptorVector MeshData::primvar_descriptors(pxr::HdInterpolation interpolation)
pxr::HdInterpolation interpolation)
{ {
pxr::HdPrimvarDescriptorVector primvars; pxr::HdPrimvarDescriptorVector primvars;
if (interpolation == pxr::HdInterpolationVertex) { if (interpolation == pxr::HdInterpolationVertex) {