teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Setting "Scene Drops" rename "3D Scene Editing"

Browse source
This commit is contained in:
Nelsson Huotari 2018-05-16 11:41:37 +03:00
parent 758ccac75a
commit 17e01ca336
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/model/prefs/state.cpp
View file

@ -230,7 +230,7 @@ void CSMPrefs::State::declare()
EnumValues landeditOutsideVisibleCell; EnumValues landeditOutsideVisibleCell;
landeditOutsideVisibleCell.add (showAndLandEdit).add (dontLandEdit); landeditOutsideVisibleCell.add (showAndLandEdit).add (dontLandEdit);
declareCategory ("Scene Drops"); declareCategory ("3D Scene Editing");
declareInt ("distance", "Drop Distance", 50). declareInt ("distance", "Drop Distance", 50).
setTooltip ("If an instance drop can not be placed against another object at the " setTooltip ("If an instance drop can not be placed against another object at the "
"insert point, it will be placed by this distance from the insert point instead"); "insert point, it will be placed by this distance from the insert point instead");

4
apps/opencs/view/render/instancemode.cpp
View file

@ -551,7 +551,7 @@ void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
if (noCell) if (noCell)
{ {
std::string mode = CSMPrefs::get()["Scene Drops"]["outside-drop"].toString(); std::string mode = CSMPrefs::get()["3D Scene Editing"]["outside-drop"].toString();
// target cell does not exist // target cell does not exist
if (mode=="Discard") if (mode=="Discard")
@ -585,7 +585,7 @@ void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
{ {
// target cell exists, but is not shown // target cell exists, but is not shown
std::string mode = std::string mode =
CSMPrefs::get()["Scene Drops"]["outside-visible-drop"].toString(); CSMPrefs::get()["3D Scene Editing"]["outside-visible-drop"].toString();
if (mode=="Discard") if (mode=="Discard")
return; return;

6
apps/opencs/view/render/terraintexturemode.cpp
View file

@ -428,7 +428,7 @@ bool CSVRender::TerrainTextureMode::allowLandTextureEditing(std::string cellId)
if (noCell) if (noCell)
{ {
std::string mode = CSMPrefs::get()["Scene Drops"]["outside-landedit"].toString(); std::string mode = CSMPrefs::get()["3D Scene Editing"]["outside-landedit"].toString();
// target cell does not exist // target cell does not exist
if (mode=="Discard") if (mode=="Discard")
@ -460,7 +460,7 @@ bool CSVRender::TerrainTextureMode::allowLandTextureEditing(std::string cellId)
{ {
// target cell exists, but is not shown // target cell exists, but is not shown
std::string mode = std::string mode =
CSMPrefs::get()["Scene Drops"]["outside-visible-landedit"].toString(); CSMPrefs::get()["3D Scene Editing"]["outside-visible-landedit"].toString();
if (mode=="Discard") if (mode=="Discard")
return false; return false;
@ -475,7 +475,7 @@ bool CSVRender::TerrainTextureMode::allowLandTextureEditing(std::string cellId)
if (noLand) if (noLand)
{ {
std::string mode = CSMPrefs::get()["Scene Drops"]["outside-landedit"].toString(); std::string mode = CSMPrefs::get()["3D Scene Editing"]["outside-landedit"].toString();
// target cell does not exist // target cell does not exist
if (mode=="Discard") if (mode=="Discard")

2
apps/opencs/view/render/worldspacewidget.cpp
View file

@ -445,7 +445,7 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo
// Default placement // Default placement
direction.normalize(); direction.normalize();
direction *= CSMPrefs::get()["Scene Drops"]["distance"].toInt(); direction *= CSMPrefs::get()["3D Scene Editing"]["distance"].toInt();
WorldspaceHitResult hit = { false, 0, 0, 0, 0, start + direction }; WorldspaceHitResult hit = { false, 0, 0, 0, 0, start + direction };
return hit; return hit;