diff --git a/src/editing/terrain/dialogterrainpainting.cpp b/src/editing/terrain/dialogterrainpainting.cpp
index 5d9f129..e329a47 100644
--- a/src/editing/terrain/dialogterrainpainting.cpp
+++ b/src/editing/terrain/dialogterrainpainting.cpp
@@ -12,6 +12,9 @@ DialogTerrainPainting::DialogTerrainPainting(QWidget*parent, TerrainDefinition*
{
ui->setupUi(this);
+ // TEMP
+ ui->brush_preview->hide();
+
_terrain_original = terrain;
_terrain_modified = (TerrainDefinition*)TerrainDefinitionClass.create();
@@ -43,12 +46,8 @@ void DialogTerrainPainting::keyReleaseEvent(QKeyEvent* event)
ui->input_brush_mode->setCurrentIndex(2);
event->accept();
break;
- case Qt::Key_F11:
- ui->input_brush_mode->setCurrentIndex(3);
- event->accept();
- break;
case Qt::Key_F12:
- ui->input_brush_mode->setCurrentIndex(4);
+ ui->input_brush_mode->setCurrentIndex(3);
event->accept();
break;
default:
diff --git a/src/editing/terrain/dialogterrainpainting.ui b/src/editing/terrain/dialogterrainpainting.ui
index 7841d7c..4607833 100644
--- a/src/editing/terrain/dialogterrainpainting.ui
+++ b/src/editing/terrain/dialogterrainpainting.ui
@@ -236,22 +236,6 @@
- -
-
-
-
- 75
- true
-
-
-
- F11
-
-
- true
-
-
-
-
@@ -272,17 +256,7 @@
- -
-
-
- Switch to magix fix tool
-
-
- true
-
-
-
- -
+
-
@@ -298,7 +272,7 @@
- -
+
-
Switch to restore tool
@@ -570,11 +544,6 @@
Flatten terrain (F4)
- -
-
- Fix discontinuities (F11)
-
-
-
Restore to default (F12)
@@ -679,41 +648,43 @@
-
-
-
- 8
-
-
-
-
-
- Brush preview :
-
-
-
- -
-
-
-
- 200
- 200
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
+
+
+
+ 8
+
+ -
+
+
+ Brush preview :
+
+
+
+ -
+
+
+
+ 200
+ 200
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
-
diff --git a/src/editing/terrain/paintingbrush.cpp b/src/editing/terrain/paintingbrush.cpp
index c24c396..f0c71f6 100644
--- a/src/editing/terrain/paintingbrush.cpp
+++ b/src/editing/terrain/paintingbrush.cpp
@@ -90,8 +90,6 @@ QString PaintingBrush::getHelpText()
return QObject::tr("Left click: add random noise to terrain
Right click: smooth details");
case PAINTING_BRUSH_FLATTEN:
return QObject::tr("Left click: flatten at height picked with right click
Right click: pick height at center");
- case PAINTING_BRUSH_FIX_DISCONTINUITIES:
- return QObject::tr("Left click: fix discontinuities in slope");
case PAINTING_BRUSH_RESTORE:
return QObject::tr("Left click: cancel all modifications on terrain");
}
@@ -127,7 +125,7 @@ void PaintingBrush::applyToTerrain(TerrainDefinition* terrain, double x, double
}
else
{
- terrainBrushAddNoise(terrain->height_map, &brush, _noise, brush_strength * 0.5);
+ terrainBrushAddNoise(terrain->height_map, &brush, _noise, brush_strength * 0.3);
}
break;
case PAINTING_BRUSH_FLATTEN:
diff --git a/src/editing/terrain/paintingbrush.h b/src/editing/terrain/paintingbrush.h
index 2adf874..249671e 100644
--- a/src/editing/terrain/paintingbrush.h
+++ b/src/editing/terrain/paintingbrush.h
@@ -10,8 +10,7 @@ typedef enum
PAINTING_BRUSH_RAISE = 0,
PAINTING_BRUSH_SMOOTH = 1,
PAINTING_BRUSH_FLATTEN = 2,
- PAINTING_BRUSH_FIX_DISCONTINUITIES = 3,
- PAINTING_BRUSH_RESTORE = 4
+ PAINTING_BRUSH_RESTORE = 3
} PaintingBrushMode;
class PaintingBrush