Merge branch 'master' of https://github.com/andreja6/G3D-Fun

2018-10-22 12:16:53 -07:00
parent eade3d8e93 ccf440a65e
commit b18ebfb56f
3 changed files with 32 additions and 10 deletions
--- a/main.cpp
+++ b/main.cpp
@@ -141,7 +141,7 @@ Demo::Demo(const GAppSettings& settings,HWND parentWindow) { //: GApp(settings,w

 	SetWindowLongPtr(_hWndMain,GWL_USERDATA,(LONG)this);
 	SetWindowLongPtr(_hwndRenderer,GWL_USERDATA,(LONG)this);
-	_propWindow = new PropertyWindow(0,0,200,640,hThisInstance);
+	_propWindow = new PropertyWindow(0, 0, 200, 640, hThisInstance);
 	IEBrowser* webBrowser = new IEBrowser(_hwndToolbox);
 	webBrowser->navigateSyncURL(L"http://scottbeebiwan.tk/g3d/toolbox/");
 }