Matching to Houdini build 18.5.318.

Author: SideFX

src/houdini/custom/RAY/BRAY_HdKarma/BRAY_HdMaterial.C

@@ -245,8 +245,30 @@ namespace
  BRAY::ScenePtr &scene,
  HdSceneDelegate &delegate)
  {
+ static constexpr UT_StringLit karmaHDA("karma:hda:");
  for (auto &&p : node.parameters)
- BRAY_HdUtil::appendVexArg(args, BRAY_HdUtil::toStr(p.first), p.second);
+ {
+ UT_StringHolder pname = BRAY_HdUtil::toStr(p.first);
+ if (pname.startsWith(karmaHDA))
+ {
+ // Special parameter that indicates we need an import from an HDA
+ UT_ASSERT(p.second.IsHolding<SdfAssetPath>());
+ UT_StringHolder hda = BRAY_HdUtil::toStr(p.second);
+ if (!hda)
+ {
+ UT_ErrorLog::error("Unable to resolve HDA path for: {}",
+ p.first);
+ }
+ else
+ {
+ scene.loadHDA(hda);
+ }
+ }
+ else
+ {
+ BRAY_HdUtil::appendVexArg(args, BRAY_HdUtil::toStr(p.first), p.second);
+ }
+ }
  if (net.nodes.size() > 1)
  {
  gatherInputs(for_surface, net, node, inputMap, args,

src/houdini/custom/USD/GEO_FilePrimUtils.C

@@ -677,8 +677,10 @@ GEOinitProperty(GEO_FilePrim &fileprim,
  const UsdPrimDefinition *primdef =
  UsdSchemaRegistry::GetInstance().FindConcretePrimDefinition(
  fileprim.getTypeName());
- SdfAttributeSpecHandle attrib_spec =
- primdef->GetSchemaAttributeSpec(usd_attr_name);
+ SdfAttributeSpecHandle attrib_spec;
+ if (primdef)
+ attrib_spec = primdef->GetSchemaAttributeSpec(usd_attr_name);
+
  if (attrib_spec)
  {
  is_uniform = (attrib_spec->GetVariability() == SdfVariabilityUniform);

src/houdini/lib/H_USD/HUSD/HUSD_CreateMaterial.C

@@ -125,8 +125,9 @@ husdCreateMainPrim( const UsdStageRefPtr &stage, const UT_StringRef &usd_path,
 
  // Add a unique id to this material/nodegraph so that nodes downstream 
  // can know if its definition has changed.
- main_prim.GetPrim().SetCustomDataByKey(HUSDgetMaterialIdToken(),
- VtValue(theMaterialIdCounter.add(1)));
+ if( main_prim )
+main_prim.GetPrim().SetCustomDataByKey(HUSDgetMaterialIdToken(),
+VtValue(theMaterialIdCounter.add(1)));
 
  return main_prim;
 }

src/houdini/lib/H_USD/HUSD/HUSD_Info.C

@@ -199,6 +199,7 @@ namespace {
  public:
  UT_StringMap<size_t> myStats[NUM_STAT_GROUPS];
  PurposeInfoMap myPurposeMap;
+ std::map<SdfPath, size_t> myMasterPrims;
  };
  typedef UT_ThreadSpecificValue<FindPrimStatsTaskThreadData *>
  FindPrimStatsTaskThreadDataTLS;
@@ -285,6 +286,10 @@ namespace {
  primtype = "Untyped";
  stats[primtype]++;
 
+ UsdPrim master(prim.GetMaster());
+ if (master)
+ threadData->myMasterPrims[master.GetPath()]++;
+
  if ((myFlags & HUSD_Info::STATS_GEOMETRY_COUNTS) == 0)
  return;
 
@@ -386,11 +391,13 @@ namespace {
  ":Guide",
  };
  UT_WorkBuffer statbuf;
+ std::map<SdfPath, size_t> masterprims;
 
  for(auto it = myThreadData.begin(); it != myThreadData.end(); ++it)
  {
  if(const auto* tdata = it.get())
  {
+ // Add up all the per-purpose primitive counts.
  for (int statidx = 0; statidx < NUM_STAT_GROUPS; statidx++)
  {
  auto &tstats = tdata->myStats[statidx];
@@ -410,8 +417,22 @@ namespace {
  stats.getOptionI(statbuf.buffer())+it->second);
  }
  }
+
+ // Make a unified map of all master prims.
+ for (auto it = tdata->myMasterPrims.begin();
+ it != tdata->myMasterPrims.end(); ++it)
+ masterprims[it->first] += it->second;
  }
  }
+ if (!masterprims.empty())
+ {
+ size_t totalinstances = 0;
+
+ for (auto &&it : masterprims)
+ totalinstances += it.second;
+ stats.setOptionI("Instance Masters", masterprims.size());
+ stats.setOptionI("Instances", totalinstances);
+ }
  }
 };
 

src/houdini/lib/H_USD/HUSD/HUSD_Scene.C

@@ -1587,17 +1587,49 @@ HUSD_Scene::lookupGeomId(const UT_StringRef &path)
  if(entry != myDisplayGeometry.end())
  return entry->second->id();
 
- return getOrCreateID(path, GEOMETRY);
+ // Path -> Render ID -> Hou Geom ID
+ auto rentry = myRenderIDs.find(path);
+ if(rentry != myRenderIDs.end())
+ {
+ auto gentry = myRenderIDtoGeomID.find(rentry->second);
+ if(gentry != myRenderIDtoGeomID.end())
+ return gentry->second;
+ }
+
+ return -1;
 }
 
 
 void
 HUSD_Scene::setRenderID(const UT_StringRef &path, int id)
 {
- myRenderIDs[path] = id;
- myRenderPaths[id] = path;
- int pid = getOrCreateID(path);
- myRenderIDtoGeomID[id] = pid;
+ int idx = path.findCharIndex('[');
+ if(idx != -1)
+ {
+ UT_StringView base_v(path.c_str(), idx);
+ UT_StringHolder base(base_v);
+
+ int pid = getOrCreateID(base, INSTANCER);
+ auto node = myTree->lookupID(pid);
+ if(node)
+ {
+ UT_StringView indices_v(path.c_str()+idx+1,
+ path.length() - idx -2);
+ UT_StringHolder indices(indices_v);
+ int inst_id = node->addInstance(indices, myTree);
+
+ myRenderIDs[path] = id;
+ myRenderPaths[id] = path;
+ myRenderIDtoGeomID[id] = inst_id;
+ }
+ }
+ else
+ {
+ myRenderIDs[path] = id;
+ myRenderPaths[id] = path;
+ int pid = getOrCreateID(path);
+ myRenderIDtoGeomID[id] = pid;
+ }
 }
 
 int
@@ -1919,6 +1951,18 @@ HUSD_Scene::convertSelection(const char *selection,
  }
 }
 
+bool
+HUSD_Scene::hasInstanceSelections()
+{
+ for(auto sel : mySelection)
+ {
+ auto type = getPrimType(sel.first);
+ if(type == INSTANCE)
+ return true;
+ }
+ return false;
+}
+
 bool
 HUSD_Scene::removeInstanceSelections()
 {
@@ -1927,7 +1971,7 @@ HUSD_Scene::removeInstanceSelections()
  for(auto sel : mySelection)
  {
  auto type = getPrimType(sel.first);
- if(type == INSTANCER || type == INSTANCE)
+ if(type == INSTANCE)
  to_remove.append(sel.first);
  }
 
@@ -1948,7 +1992,7 @@ HUSD_Scene::removePrimSelections()
  for(auto sel : mySelection)
  {
  auto type = getPrimType(sel.first);
- if(type != INSTANCER && type != INSTANCE)
+ if(type != INSTANCE)
  to_remove.append(sel.first);
  }
 
@@ -2643,27 +2687,28 @@ HUSD_Scene::isSelected(int id) const
  if(entry != node->myIDPaths->end())
  {
  const UT_StringRef &instance = entry->second;
- UT_ASSERT(instance.startsWith(theQuestionMark));
-
- // If nested, check if higher instance levels are selected.
- // Keep stripping off indices until the topmost instance is reached,
- // checking if the instancer is selected at each level.
- const int nest_level = instance.countChar(' ') -1;
- for(int pass =1; pass<nest_level; pass++)
+ if(instance.startsWith(theQuestionMark))
  {
- const int idx = instance.lastCharIndex(' ', pass);
- if(idx >= 0)
+ // If nested, check if higher instance levels are selected.
+ // Keep stripping off indices until the topmost instance is
+ // reached, checking if the instancer is selected at each level.
+ // Instances generated from Render Delegates (setRenderID())
+ // can only have 1 nesting level and don't start with ?. 
+ const int nest_level = instance.countChar(' ') -1;
+ for(int pass =1; pass<nest_level; pass++)
  {
- UT_StringHolder inst_key(instance.c_str(), idx);
- auto ientry = node->myInstances->find(inst_key);
- if(ientry != node->myInstances->end())
+ const int idx = instance.lastCharIndex(' ', pass);
+ if(idx >= 0)
  {
- if(mySelection.find(ientry->second) != mySelection.end())
+ UT_StringHolder inst_key(instance.c_str(), idx);
+ auto ientry = node->myInstances->find(inst_key);
+ if(ientry != node->myInstances->end() &&
+ mySelection.find(ientry->second) != mySelection.end())
  return true;
  }
+ else
+ break;
  }
- else
- break;
  }
  }
  }

src/houdini/lib/H_USD/HUSD/HUSD_Scene.h

@@ -215,7 +215,8 @@ class HUSD_API HUSD_Scene : public UT_NonCopyable
  // Convert a pattern to a selection.
  voidconvertSelection(const char *selection_pattern,
  UT_StringArray &paths);
- 
+
+ bool hasInstanceSelections();
  // Remove any non-prim (instance) selections.
  bool removeInstanceSelections();
  // Remove any non-instance (prim) selections.