From f7d678169864a7180de3a1b83e33d4791d0adb64 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 25 Oct 2018 18:18:08 -0700 Subject: [PATCH] Fixed properties --- PartInstance.cpp | 2 +- PropertyWindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PartInstance.cpp b/PartInstance.cpp index 9c5e8e6..a321d06 100644 --- a/PartInstance.cpp +++ b/PartInstance.cpp @@ -28,7 +28,7 @@ PartInstance::PartInstance(void) : _bevelSize(0.03f), _parseVert(0), _debugTimer void PartInstance::postRender(RenderDevice *rd) { G3D::GFontRef fntdominant = NULL; - if(fntdominant != NULL) + if(fntdominant.notNull()) { Vector3 gamepoint = cFrame.translation; Vector3 camerapoint = rd->getCameraToWorldMatrix().translation; diff --git a/PropertyWindow.cpp b/PropertyWindow.cpp index 22881bd..d15e976 100644 --- a/PropertyWindow.cpp +++ b/PropertyWindow.cpp @@ -164,7 +164,7 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) LPNMPROPGRID lpnmp = (LPNMPROPGRID)pnm; LPPROPGRIDITEM item = PropGrid_GetItemData(pnm->hwndFrom,lpnmp->iIndex); selectedInstance->PropUpdate(item); - propWind->SetProperties(selectedInstance); + //propWind->SetProperties(selectedInstance); } } break;