source/blender/render/hydra/engine.h

@@ -48,7 +48,6 @@ class Engine {
   std::unique_ptr<pxr::HdxFreeCameraSceneDelegate> free_camera_delegate_;
   std::unique_ptr<SimpleLightTaskDelegate> simple_light_task_delegate_;
   std::unique_ptr<pxr::HdEngine> engine_;
-
 };
 
 }  // namespace blender::render::hydra

source/blender/render/hydra/scene_delegate/instancer.cc

@@ -116,7 +116,8 @@ bool InstancerData::update_visibility()
   return ret;
 }
 
-pxr::HdPrimvarDescriptorVector InstancerData::primvar_descriptors(pxr::HdInterpolation interpolation) const
+pxr::HdPrimvarDescriptorVector InstancerData::primvar_descriptors(
+    pxr::HdInterpolation interpolation) const
 {
   pxr::HdPrimvarDescriptorVector primvars;
   if (interpolation == pxr::HdInterpolationInstance) {
@@ -179,8 +180,8 @@ void InstancerData::check_remove(std::set<std::string> &available_objects)
   }
   if (ret) {
     set_instances();
-    scene_delegate_->GetRenderIndex().GetChangeTracker().MarkInstancerDirty(prim_id,
-                                                                           pxr::HdChangeTracker::AllDirty);
+    scene_delegate_->GetRenderIndex().GetChangeTracker().MarkInstancerDirty(
+        prim_id, pxr::HdChangeTracker::AllDirty);
   }
 }
 
@@ -212,7 +213,8 @@ void InstancerData::set_instances()
   Instance *inst;
   pxr::SdfPath path;
 
-  ListBase *lb = object_duplilist(scene_delegate_->depsgraph, scene_delegate_->scene, (Object *)id);
+  ListBase *lb = object_duplilist(
+      scene_delegate_->depsgraph, scene_delegate_->scene, (Object *)id);
   LISTBASE_FOREACH (DupliObject *, dupli, lb) {
     path = object_prim_id(dupli->ob);
     auto it = instances_.find(path);

source/blender/render/hydra/scene_delegate/instancer.h

@@ -53,7 +53,9 @@ using InstancerDataMap =
 
 class InstanceMeshData : public MeshData {
  public:
-  InstanceMeshData(BlenderSceneDelegate *scene_delegate, Object *object, pxr::SdfPath const &prim_id);
+  InstanceMeshData(BlenderSceneDelegate *scene_delegate,
+                   Object *object,
+                   pxr::SdfPath const &prim_id);
   pxr::GfMatrix4d transform() override;
 };
 

source/blender/render/hydra/scene_delegate/light.cc

@@ -80,7 +80,7 @@ void LightData::init()
       break;
   }
 
-  p_type_ = prim_type(light);
+  prim_type_ = prim_type(light);
 
   /* TODO: temporary value, it should be delivered through Python UI */
   data_[pxr::HdLightTokens->exposure] = 1.0f;
@@ -89,13 +89,13 @@ void LightData::init()
 void LightData::insert()
 {
   ID_LOG(2, "");
-  scene_delegate_->GetRenderIndex().InsertSprim(p_type_, scene_delegate_, prim_id);
+  scene_delegate_->GetRenderIndex().InsertSprim(prim_type_, scene_delegate_, prim_id);
 }
 
 void LightData::remove()
 {
   CLOG_INFO(LOG_BSD, 2, "%s", prim_id.GetText());
-  scene_delegate_->GetRenderIndex().RemoveSprim(p_type_, prim_id);
+  scene_delegate_->GetRenderIndex().RemoveSprim(prim_type_, prim_id);
 }
 
 void LightData::update()
@@ -103,7 +103,7 @@ void LightData::update()
   ID_LOG(2, "");
 
   Light *light = (Light *)((Object *)id)->data;
-  if (prim_type(light) != p_type_) {
+  if (prim_type(light) != prim_type_) {
     remove();
     init();
     insert();

source/blender/render/hydra/scene_delegate/light.h

@@ -29,7 +29,7 @@ class LightData : public ObjectData {
   pxr::TfToken prim_type(Light *light);
 
   std::map<pxr::TfToken, pxr::VtValue> data_;
-  pxr::TfToken p_type_;
+  pxr::TfToken prim_type_;
 };
 
 }  // namespace blender::render::hydra

source/blender/render/hydra/scene_delegate/mesh.cc

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