From ff5b855e1237275663c9dd57e1dc84c55565983d Mon Sep 17 00:00:00 2001 From: andreja6 Date: Fri, 26 Oct 2018 13:15:54 -0700 Subject: [PATCH] Fixed bevels going mentally insane on duplicate --- PVInstance.cpp | 2 +- PartInstance.cpp | 3 ++- main.cpp | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/PVInstance.cpp b/PVInstance.cpp index ea85c51..1a0da08 100644 --- a/PVInstance.cpp +++ b/PVInstance.cpp @@ -27,7 +27,7 @@ std::vector PVInstance::getProperties() "Item", "NameShown", "This chooses whether the item name is shown", - false, + nameShown, PIT_CHECK)); return properties; } diff --git a/PartInstance.cpp b/PartInstance.cpp index 75c2eef..e6366c8 100644 --- a/PartInstance.cpp +++ b/PartInstance.cpp @@ -56,7 +56,7 @@ void PartInstance::postRender(RenderDevice *rd) } } -PartInstance::PartInstance(const PartInstance &oinst) +PartInstance::PartInstance(const PartInstance &oinst) : _bevelSize(0.07f), _parseVert(0), _debugTimer(0) { PVInstance::PVInstance(oinst); //name = oinst.name; @@ -77,6 +77,7 @@ PartInstance::PartInstance(const PartInstance &oinst) left = oinst.left; bottom = oinst.bottom; shape = oinst.shape; + changed = true; } void PartInstance::setSize(Vector3 newSize) diff --git a/main.cpp b/main.cpp index 6d8016f..7e7a482 100644 --- a/main.cpp +++ b/main.cpp @@ -1342,6 +1342,7 @@ void Demo::onGraphics(RenderDevice* rd) { rd->afterPrimitive(); rd->popState(); renderDevice->pop2D(); + debugAssertGLOk(); } void Demo::onKeyPressed(int key)