From ee432690e6d0b3307322bddec0d512de34588b19 Mon Sep 17 00:00:00 2001 From: Aesylwinn Date: Fri, 2 Sep 2016 21:15:05 -0400 Subject: [PATCH 1/2] Make it easier to place objects in the scene editor. This fix allows objects to be dropped onto the ground, and prevents objects from being selected through the ground. --- apps/opencs/view/render/instancemode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp index f5b15cb558..cf51e93b7f 100644 --- a/apps/opencs/view/render/instancemode.cpp +++ b/apps/opencs/view/render/instancemode.cpp @@ -92,7 +92,7 @@ osg::Vec3f CSVRender::InstanceMode::getScreenCoords(const osg::Vec3f& pos) } CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent) -: EditMode (worldspaceWidget, QIcon (":placeholder"), Mask_Reference, "Instance editing", +: EditMode (worldspaceWidget, QIcon (":placeholder"), Mask_Reference | Mask_Terrain, "Instance editing", parent), mSubMode (0), mSubModeId ("move"), mSelectionMode (0), mDragMode (DragMode_None), mDragAxis (-1), mLocked (false), mUnitScaleDist(1) { From fab7549b429c2d6b46dbc41d56c36d83110d46de Mon Sep 17 00:00:00 2001 From: Aesylwinn Date: Sat, 3 Sep 2016 17:49:49 -0400 Subject: [PATCH 2/2] Fix windows path issue in editor debug run. - The problem was caused by spaces in the data directory --- apps/opencs/model/doc/runner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/opencs/model/doc/runner.cpp b/apps/opencs/model/doc/runner.cpp index 5a0bc39be5..84bc61a9a0 100644 --- a/apps/opencs/model/doc/runner.cpp +++ b/apps/opencs/model/doc/runner.cpp @@ -81,7 +81,7 @@ void CSMDoc::Runner::start (bool delayed) arguments << ("--script-run="+mStartup->fileName());; arguments << - QString::fromUtf8 (("--data="+mProjectPath.parent_path().string()).c_str()); + QString::fromUtf8 (("--data=\""+mProjectPath.parent_path().string()+"\"").c_str()); for (std::vector::const_iterator iter (mContentFiles.begin()); iter!=mContentFiles.end(); ++iter)