Prevent creating of RenderContent class.

Make sure new render content has an id.
mcneel · Jul 24, 2023 · b369cf3 · b369cf3
1 parent a36b18f
commit b369cf3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/bindings/bnd_render_content.cpp b/src/bindings/bnd_render_content.cpp
@@ -1,8 +1,18 @@
 
 #include "bindings.h"
 
+BND_File3dmRenderContent::BND_File3dmRenderContent()
+{
+  throw pybind11::type_error("Unable to create an instance of RenderContent. Try creating RenderMaterial, RenderEnvironment, or RenderTexture");
+}
+
 BND_File3dmRenderContent::BND_File3dmRenderContent(ON_RenderContent* rc)
 {
+  if (nullptr == rc)
+    throw pybind11::value_error("NULL RenderContent");
+
+  rc->SetId();
+
   SetTrackedPointer(rc, nullptr);
 }
 
@@ -393,15 +403,8 @@ void BND_File3dmRenderTexture::SetFilename(const std::wstring& f)
 
 void BND_File3dmRenderContentTable::Add(const BND_File3dmRenderContent& rc)
 {
-  /*
-  if (nullptr != rc.m_rc)
-  {
-    m_model->AddModelComponent(*rc.m_rc);
-  }
-  */
   const ON_RenderContent* r = rc.m_rc;
   m_model->AddModelComponent(*r);
-
 }
 
 BND_File3dmRenderContent* BND_File3dmRenderContentTable::FindIndex(int index)

diff --git a/src/bindings/bnd_render_content.h b/src/bindings/bnd_render_content.h
@@ -18,7 +18,7 @@ class BND_File3dmRenderContent : public BND_ModelComponent
   void SetTrackedPointer(ON_RenderContent* rc, const ON_ModelComponentReference* compref);
 
 public:
-  BND_File3dmRenderContent() { }
+  BND_File3dmRenderContent();
   BND_File3dmRenderContent(ON_RenderContent* rc);
   BND_File3dmRenderContent(ON_RenderContent* rc, const ON_ModelComponentReference* compref);
   BND_File3dmRenderContent(const BND_File3dmRenderContent& other);