source/blender/render/hydra/engine.cc

@@ -61,6 +61,15 @@ void Engine::sync(Depsgraph *depsgraph, bContext *context)
   scene_delegate_->populate(depsgraph, context);
 }
 
+void Engine::sync_usd(pxr::UsdStageRefPtr stage)
+{
+  if (!usd_delegate_) {
+    usd_delegate_ = std::make_unique<pxr::UsdImagingDelegate>(
+        render_index_.get(), pxr::SdfPath::AbsoluteRootPath().AppendElementString("usd"));
+  }
+  usd_delegate_->Populate(stage->GetPseudoRoot());
+}
+
 void Engine::set_sync_setting(const std::string &key, const pxr::VtValue &val)
 {
   scene_delegate_->set_setting(key, val);

source/blender/render/hydra/engine.h

@@ -10,6 +10,8 @@
 #include <pxr/imaging/hd/pluginRenderDelegateUniqueHandle.h>
 #include <pxr/imaging/hdx/freeCameraSceneDelegate.h>
 #include <pxr/imaging/hgi/hgi.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usdImaging/usdImaging/delegate.h>
 
 #include "RE_engine.h"
 
@@ -29,6 +31,7 @@ class Engine {
   virtual ~Engine() = default;
 
   void sync(Depsgraph *depsgraph, bContext *context);
+  void sync_usd(pxr::UsdStageRefPtr stage);
   virtual void render(Depsgraph *depsgraph) = 0;
 
   void set_sync_setting(const std::string &key, const pxr::VtValue &val);
@@ -50,6 +53,7 @@ class Engine {
   std::unique_ptr<RenderTaskDelegate> render_task_delegate_;
   std::unique_ptr<pxr::HdxFreeCameraSceneDelegate> free_camera_delegate_;
   std::unique_ptr<SimpleLightTaskDelegate> simple_light_task_delegate_;
+  std::unique_ptr<pxr::UsdImagingDelegate> usd_delegate_;
   std::unique_ptr<pxr::HdEngine> engine_;
 };
 

source/blender/render/hydra/python.cc

@@ -3,8 +3,11 @@
 
 #include <Python.h>
 
+#include <boost/python/extract.hpp>
+
 #include <pxr/base/plug/plugin.h>
 #include <pxr/base/plug/registry.h>
+#include <pxr/usd/usd/stage.h>
 #include <pxr/usdImaging/usdImagingGL/engine.h>
 
 #include "BKE_appdir.h"
@@ -46,7 +49,7 @@ static PyObject *register_plugins_func(PyObject * /*self*/, PyObject *args)
     ss << s << ", ";
   }
   ss << "]";
-  CLOG_INFO(LOG_RENDER_HYDRA, 1, "Register %s", ss.str().c_str());
+  CLOG_INFO(LOG_RENDER_HYDRA, 0, "Register %s", ss.str().c_str());
 
   Py_RETURN_NONE;
 }
@@ -77,7 +80,7 @@ static PyObject *engine_create_func(PyObject * /*self*/, PyObject *args)
     }
   }
 
-  CLOG_INFO(LOG_RENDER_HYDRA, 2, "Engine %016llx %s", engine, engine_type);
+  CLOG_INFO(LOG_RENDER_HYDRA, 1, "Engine %016llx %s", engine, engine_type);
   return PyLong_FromVoidPtr(engine);
 }
 
@@ -91,7 +94,7 @@ static PyObject *engine_free_func(PyObject * /*self*/, PyObject *args)
   Engine *engine = (Engine *)PyLong_AsVoidPtr(pyengine);
   delete engine;
 
-  CLOG_INFO(LOG_RENDER_HYDRA, 2, "Engine %016llx", engine);
+  CLOG_INFO(LOG_RENDER_HYDRA, 1, "Engine %016llx", engine);
   Py_RETURN_NONE;
 }
 
@@ -112,6 +115,24 @@ static PyObject *engine_sync_func(PyObject * /*self*/, PyObject *args)
   Py_RETURN_NONE;
 }
 
+static PyObject *engine_sync_usd_func(PyObject * /*self*/, PyObject *args)
+{
+  PyObject *pyengine, *pystage;
+  if (!PyArg_ParseTuple(args, "OO", &pyengine, &pystage)) {
+    Py_RETURN_NONE;
+  }
+
+  Engine *engine = (Engine *)PyLong_AsVoidPtr(pyengine);
+
+  boost::python::extract<pxr::UsdStageRefPtr> extract(pystage);
+  pxr::UsdStagePtr stage = extract();
+
+  engine->sync_usd(stage);
+
+  CLOG_INFO(LOG_RENDER_HYDRA, 2, "Engine %016llx", engine);
+  Py_RETURN_NONE;
+}
+
 static PyObject *engine_render_func(PyObject * /*self*/, PyObject *args)
 {
   PyObject *pyengine, *pydepsgraph;
@@ -128,7 +149,7 @@ static PyObject *engine_render_func(PyObject * /*self*/, PyObject *args)
   engine->render(depsgraph);
   Py_END_ALLOW_THREADS;
 
-  CLOG_INFO(LOG_RENDER_HYDRA, 2, "Engine %016llx", engine);
+  CLOG_INFO(LOG_RENDER_HYDRA, 3, "Engine %016llx", engine);
   Py_RETURN_NONE;
 }
 
@@ -206,6 +227,7 @@ static PyMethodDef methods[] = {
     {"engine_create", engine_create_func, METH_VARARGS, ""},
     {"engine_free", engine_free_func, METH_VARARGS, ""},
     {"engine_sync", engine_sync_func, METH_VARARGS, ""},
+    {"engine_sync_usd", engine_sync_usd_func, METH_VARARGS, ""},
     {"engine_render", engine_render_func, METH_VARARGS, ""},
     {"engine_view_draw", engine_view_draw_func, METH_VARARGS, ""},
     {"engine_set_sync_setting", engine_set_sync_setting_func, METH_VARARGS, ""},

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

@@ -426,7 +426,7 @@ void BlenderSceneDelegate::check_updates()
   ITER_BEGIN (DEG_iterator_ids_begin, DEG_iterator_ids_next, DEG_iterator_ids_end, &data, ID *, id)
   {
     CLOG_INFO(LOG_RENDER_HYDRA_SCENE,
-              2,
+              0,
               "Update: %s [%s]",
               id->name,
               std::bitset<32>(id->recalc).to_string().c_str());

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

@@ -21,7 +21,7 @@ CurvesData::CurvesData(BlenderSceneDelegate *scene_delegate,
 
 void CurvesData::init()
 {
-  ID_LOG(2, "");
+  ID_LOG(1, "");
 
   Object *object = (Object *)id;
   write_curves((Curves *)object->data);
@@ -31,7 +31,7 @@ void CurvesData::init()
 
 void CurvesData::insert()
 {
-  ID_LOG(2, "");
+  ID_LOG(1, "");
   scene_delegate_->GetRenderIndex().InsertRprim(
       pxr::HdPrimTypeTokens->basisCurves, scene_delegate_, prim_id);
 }
@@ -64,7 +64,7 @@ void CurvesData::update()
   }
 
   scene_delegate_->GetRenderIndex().GetChangeTracker().MarkRprimDirty(prim_id, bits);
-  ID_LOG(2, "");
+  ID_LOG(1, "");
 }
 
 pxr::VtValue CurvesData::get_data(pxr::SdfPath const &id, pxr::TfToken const &key) const
@@ -87,7 +87,7 @@ bool CurvesData::update_visibility()
   if (ret) {
     scene_delegate_->GetRenderIndex().GetChangeTracker().MarkRprimDirty(
         prim_id, pxr::HdChangeTracker::DirtyVisibility);
-    ID_LOG(2, "");
+    ID_LOG(1, "");
   }
   return ret;
 }

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

@@ -68,7 +68,7 @@ std::string cache_or_get_image_file(Image *image,
     }
   }
 
-  CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 2, "%s -> %s", image->id.name, file_path.c_str());
+  CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 1, "%s -> %s", image->id.name, file_path.c_str());
   return file_path;
 }
 

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

@@ -61,19 +61,19 @@ bool InstancerData::is_visible(BlenderSceneDelegate *scene_delegate, Object *obj
 
 void InstancerData::init()
 {
-  ID_LOG(2, "");
+  ID_LOG(1, "");
   write_instances();
 }
 
 void InstancerData::insert()
 {
-  ID_LOG(2, "");
+  ID_LOG(1, "");
   scene_delegate_->GetRenderIndex().InsertInstancer(scene_delegate_, prim_id);
 }
 
 void InstancerData::remove()
 {
-  CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 2, "%s", prim_id.GetText());
+  CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 1, "%s", prim_id.GetText());
   for (auto &m_inst : mesh_instances_.values()) {
     m_inst.data->remove();
   }
@@ -87,7 +87,7 @@ void InstancerData::remove()
 
 void InstancerData::update()
 {
-  ID_LOG(2, "");
+  ID_LOG(1, "");
   Object *object = (Object *)id;
   if (id->recalc & ID_RECALC_GEOMETRY ||
       (object->data && ((ID *)object->data)->recalc & ID_RECALC_GEOMETRY) ||
@@ -115,6 +115,7 @@ bool InstancerData::update_visibility()
   bool ret = visible != prev_visible;
 
   if (ret) {
+    ID_LOG(1, "");
     auto &change_tracker = scene_delegate_->GetRenderIndex().GetChangeTracker();
     change_tracker.MarkInstancerDirty(prim_id, pxr::HdChangeTracker::DirtyVisibility);
     for (auto &m_inst : mesh_instances_.values()) {

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

@@ -24,7 +24,7 @@ LightData::LightData(BlenderSceneDelegate *scene_delegate,
 
 void LightData::init()
 {
-  ID_LOG(2, "");
+  ID_LOG(1, "");
 
   Light *light = (Light *)((Object *)id)->data;
   data_.clear();
@@ -99,19 +99,19 @@ void LightData::init()
 
 void LightData::insert()
 {
-  ID_LOG(2, "");
+  ID_LOG(1, "");
   scene_delegate_->GetRenderIndex().InsertSprim(prim_type_, scene_delegate_, prim_id);
 }
 
 void LightData::remove()
 {
-  CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 2, "%s", prim_id.GetText());
+  CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 1, "%s", prim_id.GetText());
   scene_delegate_->GetRenderIndex().RemoveSprim(prim_type_, prim_id);
 }
 
 void LightData::update()
 {
-  ID_LOG(2, "");
+  ID_LOG(1, "");
 
   Object *object = (Object *)id;
   Light *light = (Light *)object->data;
@@ -138,6 +138,8 @@ void LightData::update()
 
 pxr::VtValue LightData::get_data(pxr::TfToken const &key) const
 {
+  ID_LOG(3, "%s", key.GetText());
+  pxr::VtValue ret;
   auto it = data_.find(key);
   if (it != data_.end()) {
     return pxr::VtValue(it->second);
@@ -162,6 +164,7 @@ bool LightData::update_visibility()
   if (ret) {
     scene_delegate_->GetRenderIndex().GetChangeTracker().MarkSprimDirty(prim_id,
                                                                         pxr::HdLight::DirtyParams);
+    ID_LOG(1, "");
   }
   return ret;
 }

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

@@ -31,7 +31,7 @@ MaterialData::MaterialData(BlenderSceneDelegate *scene_delegate,
 
 void MaterialData::init()
 {
-  ID_LOG(2, "");
+  ID_LOG(1, "");
   double_sided = (((Material *)id)->blend_flag & MA_BL_CULL_BACKFACE) == 0;
 
   export_mtlx();
@@ -42,20 +42,20 @@ void MaterialData::init()
 
 void MaterialData::insert()
 {
-  ID_LOG(2, "");
+  ID_LOG(1, "");
   scene_delegate_->GetRenderIndex().InsertSprim(
       pxr::HdPrimTypeTokens->material, scene_delegate_, prim_id);
 }
 
 void MaterialData::remove()
 {
-  CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 2, "%s", prim_id.GetText());
+  CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 1, "%s", prim_id.GetText());
   scene_delegate_->GetRenderIndex().RemoveSprim(pxr::HdPrimTypeTokens->material, prim_id);
 }
 
 void MaterialData::update()
 {
-  ID_LOG(2, "");
+  ID_LOG(1, "");
   bool prev_double_sided = double_sided;
   init();
   scene_delegate_->GetRenderIndex().GetChangeTracker().MarkSprimDirty(prim_id,
@@ -146,12 +146,12 @@ void MaterialData::export_mtlx()
   PyGILState_Release(gstate);
 
   mtlx_path_ = pxr::SdfAssetPath(path, path);
-  ID_LOG(2, "mtlx=%s", mtlx_path_.GetResolvedPath().c_str());
+  ID_LOG(1, "mtlx=%s", mtlx_path_.GetResolvedPath().c_str());
 }
 
 void MaterialData::write_material_network_map()
 {
-  ID_LOG(2, "");
+  ID_LOG(1, "");
   if (mtlx_path_.GetResolvedPath().empty()) {
     material_network_map_ = pxr::VtValue();
     return;

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

@@ -23,7 +23,7 @@ MeshData::MeshData(BlenderSceneDelegate *scene_delegate,
 
 void MeshData::init()
 {
-  ID_LOG(2, "");
+  ID_LOG(1, "");
 
   Object *object = (Object *)id;
   Mesh *mesh = BKE_object_to_mesh(nullptr, object, false);
@@ -45,7 +45,7 @@ void MeshData::remove()
 {
   for (int i = 0; i < submeshes_.size(); ++i) {
     scene_delegate_->GetRenderIndex().RemoveRprim(submesh_prim_id(i));
-    CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 2, "%s: %d", prim_id.GetText(), i);
+    CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 1, "%s: %d", prim_id.GetText(), i);
   }
 }
 
@@ -73,7 +73,7 @@ void MeshData::update()
 
   for (int i = 0; i < submeshes_.size(); ++i) {
     scene_delegate_->GetRenderIndex().GetChangeTracker().MarkRprimDirty(submesh_prim_id(i), bits);
-    ID_LOG(2, "%d", i);
+    ID_LOG(1, "%d", i);
   }
 }
 
@@ -98,7 +98,7 @@ bool MeshData::update_visibility()
     for (int i = 0; i < submeshes_.size(); ++i) {
       scene_delegate_->GetRenderIndex().GetChangeTracker().MarkRprimDirty(
           submesh_prim_id(i), pxr::HdChangeTracker::DirtyVisibility);
-      ID_LOG(2, "%d", i);
+      ID_LOG(1, "%d", i);
     }
   }
   return ret;
@@ -160,7 +160,7 @@ void MeshData::update_double_sided(MaterialData *mat_data)
     if (submeshes_[i].mat_data == mat_data) {
       scene_delegate_->GetRenderIndex().GetChangeTracker().MarkRprimDirty(
           submesh_prim_id(i), pxr::HdChangeTracker::DirtyDoubleSided);
-      ID_LOG(2, "%d", i);
+      ID_LOG(1, "%d", i);
     }
   }
 }
@@ -270,16 +270,16 @@ void MeshData::write_submeshes(Mesh *mesh)
     pxr::SdfPath p = submesh_prim_id(i);
     if (i < sub_meshes_prev_count) {
       render_index.GetChangeTracker().MarkRprimDirty(p, pxr::HdChangeTracker::AllDirty);
-      ID_LOG(2, "Update %d", i);
+      ID_LOG(1, "Update %d", i);
     }
     else {
       render_index.InsertRprim(pxr::HdPrimTypeTokens->mesh, scene_delegate_, p);
-      ID_LOG(2, "Insert %d", i);
+      ID_LOG(1, "Insert %d", i);
     }
   }
   for (; i < sub_meshes_prev_count; ++i) {
     render_index.RemoveRprim(submesh_prim_id(i));
-    ID_LOG(2, "Remove %d", i);
+    ID_LOG(1, "Remove %d", i);
   }
 }
 

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

@@ -98,7 +98,7 @@ void ObjectData::update_parent()
 {
   Object *object = (Object *)id;
   if (parent_ != object->parent) {
-    ID_LOG(2, "");
+    ID_LOG(1, "");
     parent_ = object->parent;
 
     /* Looking for corresponded instancer and update it as parent */

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

@@ -37,7 +37,7 @@ WorldData::WorldData(BlenderSceneDelegate *scene_delegate,
 
 void WorldData::init()
 {
-  ID_LOG(2, "");
+  ID_LOG(1, "");
 
   write_transform();
 
@@ -104,20 +104,20 @@ void WorldData::init()
 
 void WorldData::insert()
 {
-  ID_LOG(2, "");
+  ID_LOG(1, "");
   scene_delegate_->GetRenderIndex().InsertSprim(
       pxr::HdPrimTypeTokens->domeLight, scene_delegate_, prim_id);
 }
 
 void WorldData::remove()
 {
-  CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 2, "%s", prim_id.GetText());
+  CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 1, "%s", prim_id.GetText());
   scene_delegate_->GetRenderIndex().RemoveSprim(pxr::HdPrimTypeTokens->domeLight, prim_id);
 }
 
 void WorldData::update()
 {
-  ID_LOG(2, "");
+  ID_LOG(1, "");
   init();
   scene_delegate_->GetRenderIndex().GetChangeTracker().MarkSprimDirty(prim_id,
                                                                       pxr::HdLight::AllDirty);
@@ -133,6 +133,7 @@ pxr::VtValue WorldData::get_data(pxr::TfToken const &key) const
 {
   auto it = data_.find(key);
   if (it != data_.end()) {
+    ID_LOG(3, "%s", key.GetText());
     return pxr::VtValue(it->second);
   }
   return pxr::VtValue();