diff --git a/Generals/Code/Tools/WorldBuilder/include/BrushTool.h b/Generals/Code/Tools/WorldBuilder/include/BrushTool.h
index 19c829ca14..979baa4a7b 100644
--- a/Generals/Code/Tools/WorldBuilder/include/BrushTool.h
+++ b/Generals/Code/Tools/WorldBuilder/include/BrushTool.h
@@ -45,9 +45,9 @@ class BrushTool : public Tool
 	~BrushTool(void);
 
 public:
-	static Int getWidth(void) {return m_brushWidth;};  ///<Returns width.
-	static Int getFeather(void) {return m_brushFeather;}; ///<Returns feather.
-	static Int getHeight(void) {return m_brushHeight;}; ///<Returns height.
+	static Int getWidth(void) {return m_brushWidth;};
+	static Int getFeather(void) {return m_brushFeather;};
+	static Int getHeight(void) {return m_brushHeight;};
 	static void setWidth(Int width);
 	static void setFeather(Int feather);
 	static void setHeight(Int height);
diff --git a/Generals/Code/Tools/WorldBuilder/include/brushoptions.h b/Generals/Code/Tools/WorldBuilder/include/brushoptions.h
index fe9a13b162..49675a0514 100644
--- a/Generals/Code/Tools/WorldBuilder/include/brushoptions.h
+++ b/Generals/Code/Tools/WorldBuilder/include/brushoptions.h
@@ -69,8 +69,8 @@ class BrushOptions : public COptionsPanel	, public PopupSliderOwner
 
 protected:
 	static BrushOptions *m_staticThis;  ///< Reference to the floating panel so SetWidth and SetFeather can be static.
-	static Int m_currentWidth;					///< current brush width in the ui.
-	static Int m_currentFeather;				///< current feather width in the ui.
+	static Int m_currentWidth;
+	static Int m_currentFeather;
 	static Int m_currentHeight;
 
 	Bool		m_updating; ///<true if the ui is updating itself.
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h
index 7c767c82bb..088e7ad2e8 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h
@@ -31,14 +31,40 @@ class WorldHeightMapEdit;
 ///  Height brush tool.
 class BrushTool : public Tool
 {
+public:
+	enum {
+		MIN_RAISE_LOWER = 1,
+		MAX_RAISE_LOWER = 21,
+		MIN_SMOOTH_RADIUS = 1,
+		MAX_SMOOTH_RADIUS = 5,
+		MIN_SMOOTH_RATE = 1,
+		MAX_SMOOTH_RATE = 10
+	};
+
+	enum EBrushMode {
+		BRUSH_MODE_RAISE,
+		BRUSH_MODE_LOWER,
+		BRUSH_MODE_SET,
+		BRUSH_MODE_SMOOTH
+	};
+
 protected:
+	enum {MIN_DELAY_TIME = 60};
+
 	WorldHeightMapEdit *m_htMapEditCopy; ///< ref counted.
 	WorldHeightMapEdit *m_htMapFeatherCopy; ///< ref counted.
+	WorldHeightMapEdit *m_htMapRateCopy; ///< ref counted (smooth mode).
 
 	static Int m_brushWidth;
 	static Int m_brushFeather;
 	static Bool m_brushSquare;
 	static Int m_brushHeight;
+	static Int m_raiseLowerAmount;
+	static Int m_smoothRadius;
+	static Int m_smoothRate;
+
+	EBrushMode m_activeMode;
+	Int m_lastMoveTime;
 
 public:
 	BrushTool(void);
@@ -48,9 +74,68 @@ class BrushTool : public Tool
 	static Int getWidth(void) {return m_brushWidth;};  ///<Returns width.
 	static Int getFeather(void) {return m_brushFeather;}; ///<Returns feather.
 	static Int getHeight(void) {return m_brushHeight;}; ///<Returns height.
+	static Int getRaiseLowerAmount(void) {return m_raiseLowerAmount;};
+	static Int getSmoothRadius(void) {return m_smoothRadius;};
+	static Int getSmoothRate(void) {return m_smoothRate;};
 	static void setWidth(Int width);
 	static void setFeather(Int feather);
 	static void setHeight(Int height);
+	static void setRaiseLowerAmount(Int amount);
+	static void setSmoothRadius(Int radius);
+	static void setSmoothRate(Int rate);
+	static EBrushMode getModeFromModifiers(Bool shiftDown, Bool ctrlDown);
+	static EBrushMode getPreviewModeFromKeys();
+	static const char* getModeDisplayName(EBrushMode mode);
+	static void getModeHintStrings(char *primaryBuf, Int primaryBufSize, char *secondaryBuf, Int secondaryBufSize);
+	
+	// Helper functions for brush hint drawing (shared between 2D and 3D views)
+	struct BrushHintInfo {
+		Bool shouldShow;
+		Bool shouldClear;
+		EBrushMode currentMode;
+		Int modeInt;
+		CPoint hintPos;
+	};
+	static Bool getBrushHintInfo(BrushHintInfo &info, char *hintTextBuf, Int hintTextBufSize, const CPoint &hintPos, Int lastBrushMode);
+	
+	// Shared smoothing algorithm function (processes a single cell)
+	static void applySmoothingAlgorithm(
+		WorldHeightMapEdit *editMap,
+		WorldHeightMapEdit *featherMap,
+		Int i, Int j,
+		Int rate,
+		Int smoothRadius,
+		Int minRadius,
+		Int maxRadius,
+		CWorldBuilderDoc *pDoc);
+	
+	// Shared brush iteration with rate accumulation - returns true if rate buffer overflow occurred
+	static Bool applyBrushWithRateAccumulation(
+		WorldHeightMapEdit *editMap,
+		WorldHeightMapEdit *featherMap,
+		WorldHeightMapEdit *rateMap,
+		const CPoint &ndx,
+		Int brushWidth,
+		Int rateMultiplier,
+		Int smoothRadius,
+		Int minRadius,
+		Int maxRadius,
+		CWorldBuilderDoc *pDoc);
+	
+	// Shared rate buffer reset
+	static void resetSmoothingBuffers(
+		WorldHeightMapEdit *editMap,
+		WorldHeightMapEdit *featherMap,
+		WorldHeightMapEdit *rateMap);
+	
+	// Helper to create a partial range for height map updates
+	static IRegion2D makePartialRange(const CPoint &ndx, Int brushWidth);
+	
+	// Helper to calculate blend factor (square or round)
+	static Real calcBlendFactor(const CPoint &ndx, Int i, Int j, Int width, Int feather, Bool square);
+	
+	// Helper to get effective brush width including feather
+	static Int getEffectiveBrushWidth(Int baseWidth, Int feather);
 
 public:
 	virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
@@ -60,4 +145,10 @@ class BrushTool : public Tool
 	virtual void activate(); ///< Become the current tool.
 	virtual Bool followsTerrain(void) {return false;};
 
+protected:
+	EBrushMode determineBrushMode() const;
+	void applySetHeightBrush(const CPoint &ndx, Int brushWidth, CWorldBuilderDoc *pDoc);
+	void applyRaiseLowerBrush(const CPoint &ndx, Int brushWidth, Bool raising, CWorldBuilderDoc *pDoc);
+	void applySmoothBrush(const CPoint &ndx, Int brushWidth, CWorldBuilderDoc *pDoc);
+	void resetSmoothRateBuffer();
 };
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h b/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h
index 77ea5426b1..6581655295 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h
@@ -96,6 +96,7 @@ class DrawObject : public RenderObjClass
 	static void enableFeedback(void) {m_disableFeedback = false;};
 	static Bool isFeedbackEnabled(void) { return !m_disableFeedback;};
 	static void setFeedbackPos(Coord3D pos);
+	static Coord3D getFeedbackPos() { return m_feedbackPoint; }
 
 	static void setWaypointDragFeedback(const Coord3D &start, const Coord3D &end);
 	static void setRampFeedbackParms(const Coord3D *start, const Coord3D *end, Real rampWidth);
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h
index 919d8522bd..639a36ed79 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h
@@ -73,6 +73,8 @@ class CWorldBuilderView : public WbView
 	CPoint	m_scrollMin;								///< The minimum scrollbar positions.
 	CPoint	m_scrollMax;								///< The maximum scroll bar positions.
 
+	HintDrawState m_brushHintState;	///< Flicker reduction state for brush mode hint
+
 protected:
 
 	/// Draw a texture bitmap in a rectangle in the dc.
@@ -98,6 +100,11 @@ class CWorldBuilderView : public WbView
 	/// Draw the object's icon in the dc at a given point.
 	void drawObjectInView(CDC *pDc, MapObject *pMapObj);
 
+	/// Draw brush mode hint on canvas
+	void drawBrushModeHint(CDC *pDc, CRgn *pUpdateRgn = NULL);
+	/// Clears the brush mode hint state
+	void clearBrushModeHintState();
+
 public:
 	/// Get the current draw size in pixels in the 2d window of one height map cell.
 	Int getCellSize(void) {return m_cellSize;}
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h
index 251eceee38..c515a52e14 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h
@@ -23,6 +23,7 @@
 
 #include "WBPopupSlider.h"
 #include "OptionsPanel.h"
+#include "BrushTool.h"
 /////////////////////////////////////////////////////////////////////////////
 /// BrushOptions modeless (floating) dialog - allows entry and display of brush width and feather.
 
@@ -35,7 +36,13 @@ class BrushOptions : public COptionsPanel	, public PopupSliderOwner
 				FREQ_BRUSH_TICKS=10,
 				MIN_FEATHER=0,
 				FREQ_FEATHER_TICKS=4,
-				MAX_FEATHER=20};
+				MAX_FEATHER=20,
+				MIN_RAISE_LOWER = BrushTool::MIN_RAISE_LOWER,
+				MAX_RAISE_LOWER = BrushTool::MAX_RAISE_LOWER,
+				MIN_SMOOTH_RADIUS = BrushTool::MIN_SMOOTH_RADIUS,
+				MAX_SMOOTH_RADIUS = BrushTool::MAX_SMOOTH_RADIUS,
+				MIN_SMOOTH_RATE = BrushTool::MIN_SMOOTH_RATE,
+				MAX_SMOOTH_RATE = BrushTool::MAX_SMOOTH_RATE};
 
 	BrushOptions(CWnd* pParent = NULL);   // standard constructor
 
@@ -64,6 +71,9 @@ class BrushOptions : public COptionsPanel	, public PopupSliderOwner
 	afx_msg void OnChangeFeatherEdit();
 	afx_msg void OnChangeSizeEdit();
 	afx_msg void OnChangeHeightEdit();
+	afx_msg void OnChangeRaiseLowerEdit();
+	afx_msg void OnChangeSmoothRadiusEdit();
+	afx_msg void OnChangeSmoothRateEdit();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
@@ -72,16 +82,25 @@ class BrushOptions : public COptionsPanel	, public PopupSliderOwner
 	static Int m_currentWidth;					///< current brush width in the ui.
 	static Int m_currentFeather;				///< current feather width in the ui.
 	static Int m_currentHeight;
+	static Int m_currentRaiseLower;
+	static Int m_currentSmoothRadius;
+	static Int m_currentSmoothRate;
 
 	Bool		m_updating; ///<true if the ui is updating itself.
 	WBPopupSliderButton m_brushWidthPopup;
 	WBPopupSliderButton m_brushFeatherPopup;
 	WBPopupSliderButton m_brushHeightPopup;
+	WBPopupSliderButton m_raiseLowerPopup;
+	WBPopupSliderButton m_smoothRadiusPopup;
+	WBPopupSliderButton m_smoothRatePopup;
 
 public:
 	static void setWidth(Int width);
 	static void setFeather(Int feather);
 	static void setHeight(Int height);
+	static void setRaiseLowerAmount(Int amount);
+	static void setSmoothRadius(Int radius);
+	static void setSmoothRate(Int rate);
 
 public:
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h
index 60f9cdd642..056f8bdde5 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h
@@ -40,6 +40,49 @@ enum RulerTypeEnum {
 	RULER_CIRCLE,
 };
 
+/////////////////////////////////////////////////////////////////////////////
+// HintDrawState - reusable flicker reduction state for on-screen text hints
+//
+// Usage:
+//   1. Call beginFrame() at start of each paint/render cycle
+//   2. Call needsUpdate() to check if hint position changed significantly
+//   3. Call commitUpdate() after drawing to store the new state
+//   4. Call reset() when hint should be hidden
+
+struct HintDrawState {
+	Int lastMode;
+	CRect lastRect;
+	CPoint lastPos;
+	Bool drawnThisFrame;
+	
+	HintDrawState() : lastMode(-1), lastPos(-10000, -10000), drawnThisFrame(false) {}
+	
+	void reset() {
+		if (!lastRect.IsRectEmpty()) {
+			lastRect.SetRectEmpty();
+			lastMode = -1;
+			lastPos = CPoint(-10000, -10000);
+		}
+	}
+	
+	void beginFrame() { drawnThisFrame = false; }
+	
+	bool needsUpdate(CPoint newPos, Int newMode, Int threshold = 15) const {
+		if (newMode != lastMode) return true;
+		if (lastRect.IsRectEmpty()) return true;
+		Int dx = abs(newPos.x - lastPos.x);
+		Int dy = abs(newPos.y - lastPos.y);
+		return (dx > threshold || dy > threshold);
+	}
+	
+	void commitUpdate(CPoint pos, const CRect& rect, Int mode) {
+		lastPos = pos;
+		lastRect = rect;
+		lastMode = mode;
+		drawnThisFrame = true;
+	}
+};
+
 /////////////////////////////////////////////////////////////////////////////
 // WbView view
 
@@ -241,10 +284,13 @@ class WbView : public CView
 	afx_msg void OnShowTerrain();
 	afx_msg void OnUpdateShowTerrain(CCmdUI* pCmdUI);
 	afx_msg int OnCreate(LPCREATESTRUCT lpcs);
-
+	afx_msg BOOL OnMouseWheel(UINT nFlags, short zDelta, CPoint point);
 
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
+
+protected:
+	Bool handleBrushMouseWheel(UINT nFlags, short zDelta);
 };
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h
index 95d71082e5..1a8f62e501 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h
@@ -93,6 +93,7 @@ class WbView3d : public WbView, public DX8_CleanupHook
 	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
 	afx_msg void OnPaint();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
 	afx_msg BOOL OnMouseWheel(UINT nFlags, short zDelta, CPoint pt);
 	afx_msg void OnTimer(UINT nIDEvent);
 	afx_msg void OnDestroy();
@@ -216,6 +217,8 @@ class WbView3d : public WbView, public DX8_CleanupHook
 	Int											m_pickPixels;
 	Int											m_partialMapSize;
 
+	HintDrawState						m_brushHintState;		///< Flicker reduction state for brush mode hint
+
 protected:
 
 	UINT getLastDrawTime();
@@ -225,6 +228,8 @@ class WbView3d : public WbView, public DX8_CleanupHook
   void drawCircle( HDC hdc, const Coord3D & centerPoint, Real radius, COLORREF color );
 	void drawLabels(HDC hdc);
 	void drawLabels(void);
+	void drawBrushModeHint(HDC hdc);
+	void clearBrushModeHintState();
 	void shutdownWW3D();
 	void killTheTimer();
 	void render();
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/res/WorldBuilder.rc b/GeneralsMD/Code/Tools/WorldBuilder/res/WorldBuilder.rc
index ef28eed189..0a64a1773f 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/res/WorldBuilder.rc
+++ b/GeneralsMD/Code/Tools/WorldBuilder/res/WorldBuilder.rc
@@ -494,7 +494,7 @@ BEGIN
     CONTROL         "",ID_SLIDER,"Static",SS_BLACKFRAME,0,1,19,62
 END
 
-IDD_BRUSH_OPTIONS DIALOG DISCARDABLE  0, 0, 118, 138
+IDD_BRUSH_OPTIONS DIALOG DISCARDABLE  0, 0, 118, 300
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Height Brush Options"
 FONT 8, "MS Sans Serif"
@@ -504,16 +504,33 @@ BEGIN
     EDITTEXT        IDC_FEATHER_EDIT,71,55,17,12,ES_AUTOHSCROLL
     RTEXT           "Size in cells:",IDC_STATIC,24,56,39,10
     PUSHBUTTON      "1",IDC_SIZE_POPUP,93,11,8,12,BS_BITMAP
-    GROUPBOX        "Brush Width:",IDC_STATIC,1,1,113,34
-    GROUPBOX        "Brush Feather Width:",IDC_STATIC,1,43,113,39
+    GROUPBOX        "Brush Width (Shift + Scroll Wheel):",IDC_STATIC,1,1,113,34
+    GROUPBOX        "Brush Feather Width (Ctrl + Scroll Wheel):",IDC_STATIC,1,43,113,39
     PUSHBUTTON      "1",IDC_FEATHER_POPUP,93,55,8,12,BS_BITMAP
     LTEXT           "35 FT.",IDC_WIDTH_LABEL,71,24,43,8
-    LTEXT           "35 FT.",IDC_HEIGHT_LABEL,71,120,36,8
-    GROUPBOX        "Brush Height:",IDC_STATIC,1,90,113,45
-    EDITTEXT        IDC_HEIGHT_EDIT,71,105,17,12,ES_AUTOHSCROLL
-    RTEXT           "Size in 1/8 cells:",IDC_STATIC,0,107,63,10
-    PUSHBUTTON      "1",IDC_HEIGHT_POPUP,93,106,8,12,BS_BITMAP
     LTEXT           "35 FT.",IDC_FEATHER_LABEL,71,68,41,8
+    GROUPBOX        "Raise / Lower Amount (LMB / Shift+LMB):",IDC_STATIC,1,90,113,34
+    EDITTEXT        IDC_RAISELOWER_EDIT,71,105,17,12,ES_AUTOHSCROLL
+    RTEXT           "Amount:",IDC_STATIC,23,106,40,8
+    PUSHBUTTON      "1",IDC_RAISELOWER_POPUP,93,105,8,12,BS_BITMAP
+    LTEXT           "0.0 FEET.",IDC_RAISELOWER_LABEL,71,118,43,8
+    GROUPBOX        "Set Height (Ctrl + LMB):",IDC_STATIC,1,132,113,34
+    EDITTEXT        IDC_HEIGHT_EDIT,71,147,17,12,ES_AUTOHSCROLL
+    RTEXT           "Size in 1/8 cells:",IDC_STATIC,0,149,63,10
+    PUSHBUTTON      "1",IDC_HEIGHT_POPUP,93,148,8,12,BS_BITMAP
+    LTEXT           "35 FT.",IDC_HEIGHT_LABEL,71,160,36,8
+    GROUPBOX        "Smooth (Ctrl + Shift + LMB):",IDC_STATIC,1,174,113,50
+    EDITTEXT        IDC_RADIUS_EDIT,71,189,17,12,ES_AUTOHSCROLL
+    RTEXT           "Radius:",IDC_STATIC,23,190,40,8
+    PUSHBUTTON      "1",IDC_RADIUS_POPUP,93,189,8,12,BS_BITMAP
+    EDITTEXT        IDC_RATE_EDIT,71,205,17,12,ES_AUTOHSCROLL
+    RTEXT           "Rate:",IDC_STATIC,23,206,40,8
+    PUSHBUTTON      "1",IDC_RATE_POPUP,93,205,8,12,BS_BITMAP
+    GROUPBOX        "Brush Modes:",IDC_STATIC,1,232,113,65
+    LTEXT           "LMB - Raise Height",IDC_STATIC,5,242,108,8
+    LTEXT           "Shift + LMB - Lower Height",IDC_STATIC,5,252,108,8
+    LTEXT           "Ctrl + LMB - Set Height",IDC_STATIC,5,262,108,8
+    LTEXT           "Ctrl + Shift + LMB - Smooth",IDC_STATIC,5,272,108,8
 END
 
 IDD_TERRAIN_MATERIAL DIALOG DISCARDABLE  0, 0, 200, 286
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/res/resource.h b/GeneralsMD/Code/Tools/WorldBuilder/res/resource.h
index f2f8982adf..7d1deee76c 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/res/resource.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/res/resource.h
@@ -199,6 +199,10 @@
 #define IDC_PSEd_Color1                 1031
 #define IDC_FEATHER_LABEL               1032
 #define IDC_WIDTH_LABEL3                1032
+#define IDC_RAISELOWER_EDIT             1800
+#define IDC_RAISELOWER_POPUP            1801
+#define IDC_RAISELOWER_LABEL            1802
+#define IDC_MODE_LEGEND                 1803
 #define IDC_TERRAIN_TREEVIEW            1033
 #define IDC_SLIDER3                     1034
 #define IDC_SWAP_TEXTURES               1035
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/BrushTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/BrushTool.cpp
index 7cbef8f854..1eeca6952d 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/BrushTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/BrushTool.cpp
@@ -31,6 +31,8 @@
 #include "WorldBuilderView.h"
 #include "brushoptions.h"
 #include "DrawObject.h"
+#include "WorldBuilder.h"
+#include "Lib/BaseType.h"
 //
 // BrushTool class.
 //
@@ -39,6 +41,9 @@ Int BrushTool::m_brushWidth;
 Int BrushTool::m_brushFeather;
 Bool BrushTool::m_brushSquare;
 Int BrushTool::m_brushHeight;
+Int BrushTool::m_raiseLowerAmount = BrushTool::MIN_RAISE_LOWER;
+Int BrushTool::m_smoothRadius = BrushTool::MIN_SMOOTH_RADIUS;
+Int BrushTool::m_smoothRate = BrushTool::MIN_SMOOTH_RATE;
 
 
 
@@ -48,11 +53,19 @@ BrushTool::BrushTool(void) :
 {
 	m_htMapEditCopy = NULL;
 	m_htMapFeatherCopy = NULL;
+	m_htMapRateCopy = NULL;
 
 	m_brushWidth = 0;
 	m_brushFeather = 0;
 	m_brushHeight = 0;
 	m_brushSquare = false;
+	m_activeMode = BRUSH_MODE_RAISE;
+	m_lastMoveTime = 0;
+
+	// Sensible defaults for the combined brush workflow.
+	setRaiseLowerAmount(4);
+	setSmoothRadius(2);
+	setSmoothRate(5);
 }
 
 /// Destructor
@@ -60,6 +73,7 @@ BrushTool::~BrushTool(void)
 {
 	REF_PTR_RELEASE(m_htMapEditCopy);
 	REF_PTR_RELEASE(m_htMapFeatherCopy);
+	REF_PTR_RELEASE(m_htMapRateCopy);
 }
 
 /// Set the brush height and notify the height options panel of the change.
@@ -72,6 +86,33 @@ void BrushTool::setHeight(Int height)
 	}
 };
 
+void BrushTool::setRaiseLowerAmount(Int amount)
+{
+	amount = clamp((Int)MIN_RAISE_LOWER, amount, (Int)MAX_RAISE_LOWER);
+	if (m_raiseLowerAmount != amount) {
+		m_raiseLowerAmount = amount;
+		BrushOptions::setRaiseLowerAmount(amount);
+	}
+}
+
+void BrushTool::setSmoothRadius(Int radius)
+{
+	radius = clamp((Int)MIN_SMOOTH_RADIUS, radius, (Int)MAX_SMOOTH_RADIUS);
+	if (m_smoothRadius != radius) {
+		m_smoothRadius = radius;
+		BrushOptions::setSmoothRadius(radius);
+	}
+}
+
+void BrushTool::setSmoothRate(Int rate)
+{
+	rate = clamp((Int)MIN_SMOOTH_RATE, rate, (Int)MAX_SMOOTH_RATE);
+	if (m_smoothRate != rate) {
+		m_smoothRate = rate;
+		BrushOptions::setSmoothRate(rate);
+	}
+}
+
 /// Set the brush width and notify the height options panel of the change.
 void BrushTool::setWidth(Int width)
 {
@@ -109,14 +150,29 @@ void BrushTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB
 {
 	if (m != TRACK_L) return;
 
-//	WorldHeightMapEdit *pMap = pDoc->GetHeightMap();
+	m_activeMode = determineBrushMode();
+
 	// just in case, release it.
 	REF_PTR_RELEASE(m_htMapEditCopy);
+	REF_PTR_RELEASE(m_htMapFeatherCopy);
+	REF_PTR_RELEASE(m_htMapRateCopy);
+
 	m_htMapEditCopy = pDoc->GetHeightMap()->duplicate();
+	m_htMapFeatherCopy = m_htMapEditCopy->duplicate();
+
+	if (m_activeMode == BRUSH_MODE_SMOOTH) {
+		m_htMapRateCopy = m_htMapEditCopy->duplicate();
+		resetSmoothRateBuffer();
+	}
+
 	m_prevXIndex = -1;
 	m_prevYIndex = -1;
-	REF_PTR_RELEASE(m_htMapFeatherCopy);
-	m_htMapFeatherCopy = m_htMapEditCopy->duplicate();
+
+	m_lastMoveTime = ::GetTickCount();
+	if (m_activeMode == BRUSH_MODE_RAISE || m_activeMode == BRUSH_MODE_LOWER) {
+		m_lastMoveTime -= MIN_DELAY_TIME + 1; // Fire immediately for raise/lower.
+	}
+
 	mouseMoved(m, viewPt, pView, pDoc);
 }
 
@@ -132,6 +188,7 @@ void BrushTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBui
 	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
 	REF_PTR_RELEASE(m_htMapEditCopy);
 	REF_PTR_RELEASE(m_htMapFeatherCopy);
+	REF_PTR_RELEASE(m_htMapRateCopy);
 }
 
 /// Execute the tool.
@@ -146,20 +203,46 @@ void BrushTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 
 	pView->viewToDocCoords(viewPt, &cpt);
 
-	int brushWidth = m_brushWidth;
-	if (m_brushFeather>0) {
-		brushWidth += 2*m_brushFeather;
-	}
-	brushWidth += 2;
-
 	CPoint ndx;
 	getCenterIndex(&cpt, m_brushWidth, &ndx, pDoc);
 
-	if (m_prevXIndex == ndx.x && m_prevYIndex == ndx.y) return;
+	Bool skipDuplicateCell = (m_activeMode == BRUSH_MODE_SET);
+	if (skipDuplicateCell && m_prevXIndex == ndx.x && m_prevYIndex == ndx.y) return;
 
 	m_prevXIndex = ndx.x;
 	m_prevYIndex = ndx.y;
 
+	switch (m_activeMode) {
+		case BRUSH_MODE_RAISE:
+		case BRUSH_MODE_LOWER: {
+			Int brushWidth = getEffectiveBrushWidth(m_brushWidth, m_brushFeather);
+			applyRaiseLowerBrush(ndx, brushWidth, (m_activeMode == BRUSH_MODE_RAISE), pDoc);
+			break;
+		}
+		case BRUSH_MODE_SET: {
+			Int brushWidth = getEffectiveBrushWidth(m_brushWidth, m_brushFeather);
+			applySetHeightBrush(ndx, brushWidth, pDoc);
+			break;
+		}
+		case BRUSH_MODE_SMOOTH: {
+			Int brushWidth = max(1, m_brushWidth);
+			applySmoothBrush(ndx, brushWidth, pDoc);
+			break;
+		}
+	}
+}
+
+BrushTool::EBrushMode BrushTool::determineBrushMode() const
+{
+	Bool shift = (0x8000 & ::GetAsyncKeyState(VK_SHIFT)) != 0;
+	Bool ctrl = (0x8000 & ::GetAsyncKeyState(VK_CONTROL)) != 0;
+	return getModeFromModifiers(shift, ctrl);
+}
+
+void BrushTool::applySetHeightBrush(const CPoint &ndx, Int brushWidth, CWorldBuilderDoc *pDoc)
+{
+	if (!m_htMapEditCopy || !m_htMapFeatherCopy) return;
+
 	int sub = brushWidth/2;
 	int add = brushWidth-sub;
 
@@ -172,15 +255,10 @@ void BrushTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 			if (j<0 || j>=m_htMapEditCopy->getYExtent()) {
 				continue;
 			}
-			Real blendFactor;
-			if (m_brushSquare) {
-				blendFactor = calcSquareBlendFactor(ndx, i, j, m_brushWidth, m_brushFeather);
-			} else {
-				blendFactor = calcRoundBlendFactor(ndx, i, j, m_brushWidth, m_brushFeather);
-			}
+			Real blendFactor = calcBlendFactor(ndx, i, j, m_brushWidth, m_brushFeather, m_brushSquare);
 			Int curHeight = m_htMapFeatherCopy->getHeight(i,j);
-			float fNewHeight = blendFactor*m_brushHeight+((1.0f-blendFactor)*curHeight) ;
-			Int newHeight = floor(fNewHeight+0.5);
+			float fNewHeight = blendFactor*m_brushHeight+((1.0f-blendFactor)*curHeight);
+			Int newHeight = floor(fNewHeight+0.5f);
 			if (m_brushHeight > curHeight) {
 				if (m_htMapEditCopy->getHeight(i,j)>newHeight) {
 					newHeight = m_htMapEditCopy->getHeight(i,j);
@@ -193,10 +271,315 @@ void BrushTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld
 			m_htMapEditCopy->setHeight(i, j, newHeight);
 		}
 	}
-	IRegion2D partialRange;
-	partialRange.lo.x = ndx.x - brushWidth;
-	partialRange.hi.x = ndx.x + brushWidth;
-	partialRange.lo.y = ndx.y - brushWidth;
-	partialRange.hi.y = ndx.y + brushWidth;
-	pDoc->updateHeightMap(m_htMapEditCopy, true, partialRange);
+
+	pDoc->updateHeightMap(m_htMapEditCopy, true, makePartialRange(ndx, brushWidth));
+}
+
+void BrushTool::applyRaiseLowerBrush(const CPoint &ndx, Int brushWidth, Bool raising, CWorldBuilderDoc *pDoc)
+{
+	if (!m_htMapEditCopy || !m_htMapFeatherCopy) return;
+
+	Int curTime = ::GetTickCount();
+	Int deltaTime = curTime - m_lastMoveTime;
+	if (deltaTime < MIN_DELAY_TIME) return;
+	m_lastMoveTime = curTime;
+
+	int sub = brushWidth/2;
+	int add = brushWidth-sub;
+
+	Int htDelta = raising?m_raiseLowerAmount:-m_raiseLowerAmount;
+	Int i, j;
+	for (i=ndx.x-sub; i<ndx.x+add; i++) {
+		if (i<0 || i>=m_htMapEditCopy->getXExtent()) {
+			continue;
+		}
+		for (j=ndx.y-sub; j<ndx.y+add; j++) {
+			if (j<0 || j>=m_htMapEditCopy->getYExtent()) {
+				continue;
+			}
+			Real blendFactor = calcBlendFactor(ndx, i, j, m_brushWidth, m_brushFeather, m_brushSquare);
+			Int curHeight = m_htMapEditCopy->getHeight(i,j);
+			float fNewHeight = (blendFactor*(htDelta+curHeight))+((1.0f-blendFactor)*curHeight);
+			Int newHeight = floor(fNewHeight+0.5f);
+			newHeight = clamp(m_htMapFeatherCopy->getMinHeightValue(), newHeight, m_htMapFeatherCopy->getMaxHeightValue());
+
+			m_htMapEditCopy->setHeight(i, j, newHeight);
+			pDoc->invalCell(i, j);
+		}
+	}
+
+	pDoc->updateHeightMap(m_htMapEditCopy, true, makePartialRange(ndx, brushWidth));
+}
+
+void BrushTool::applySmoothBrush(const CPoint &ndx, Int brushWidth, CWorldBuilderDoc *pDoc)
+{
+	Bool redoRate = applyBrushWithRateAccumulation(
+		m_htMapEditCopy, m_htMapFeatherCopy, m_htMapRateCopy,
+		ndx, brushWidth, m_smoothRate * 5,
+		m_smoothRadius, MIN_SMOOTH_RADIUS, MAX_SMOOTH_RADIUS, pDoc);
+
+	pDoc->updateHeightMap(m_htMapEditCopy, true, makePartialRange(ndx, brushWidth));
+
+	if (redoRate) {
+		resetSmoothRateBuffer();
+	}
+}
+
+void BrushTool::resetSmoothRateBuffer()
+{
+	resetSmoothingBuffers(m_htMapEditCopy, m_htMapFeatherCopy, m_htMapRateCopy);
+}
+
+BrushTool::EBrushMode BrushTool::getModeFromModifiers(Bool shiftDown, Bool ctrlDown)
+{
+	if (ctrlDown) {
+		return shiftDown ? BRUSH_MODE_SMOOTH : BRUSH_MODE_SET;
+	}
+	if (shiftDown) {
+		return BRUSH_MODE_LOWER;
+	}
+	return BRUSH_MODE_RAISE;
+}
+
+BrushTool::EBrushMode BrushTool::getPreviewModeFromKeys()
+{
+	Bool shiftDown = (0x8000 & ::GetAsyncKeyState(VK_SHIFT)) != 0;
+	Bool ctrlDown = (0x8000 & ::GetAsyncKeyState(VK_CONTROL)) != 0;
+	return getModeFromModifiers(shiftDown, ctrlDown);
+}
+
+const char* BrushTool::getModeDisplayName(EBrushMode mode)
+{
+	switch (mode) {
+		case BRUSH_MODE_LOWER:
+			return "Lower Height (Shift + LMB)";
+		case BRUSH_MODE_SET:
+			return "Set Height (Ctrl + LMB)";
+		case BRUSH_MODE_SMOOTH:
+			return "Smooth Height (Ctrl + Shift + LMB)";
+		case BRUSH_MODE_RAISE:
+		default:
+			return "Raise Height (LMB)";
+	}
+}
+
+void BrushTool::getModeHintStrings(char *primaryBuf, Int primaryBufSize, char *secondaryBuf, Int secondaryBufSize)
+{
+	if (primaryBuf && primaryBufSize > 0) {
+		primaryBuf[0] = '\0';
+	}
+	if (secondaryBuf && secondaryBufSize > 0) {
+		secondaryBuf[0] = '\0';
+	}
+
+	Bool shiftDown = (0x8000 & ::GetAsyncKeyState(VK_SHIFT)) != 0;
+	Bool ctrlDown = (0x8000 & ::GetAsyncKeyState(VK_CONTROL)) != 0;
+
+	EBrushMode mode = getModeFromModifiers(shiftDown, ctrlDown);
+	const char *modeLabel = getModeDisplayName(mode);
+
+	if (primaryBuf && primaryBufSize > 0) {
+		snprintf(primaryBuf, primaryBufSize, "Brush Mode: %s", modeLabel);
+	}
+
+	if (secondaryBuf && secondaryBufSize > 0) {
+		const char *defaultPrefix = (!shiftDown && !ctrlDown) ? "[" : "";
+		const char *defaultSuffix = (!shiftDown && !ctrlDown) ? "]" : "";
+		const char *shiftPrefix = (shiftDown && !ctrlDown) ? "[" : "";
+		const char *shiftSuffix = (shiftDown && !ctrlDown) ? "]" : "";
+		const char *ctrlPrefix = (!shiftDown && ctrlDown) ? "[" : "";
+		const char *ctrlSuffix = (!shiftDown && ctrlDown) ? "]" : "";
+		const char *ctrlShiftPrefix = (shiftDown && ctrlDown) ? "[" : "";
+		const char *ctrlShiftSuffix = (shiftDown && ctrlDown) ? "]" : "";
+
+		snprintf(secondaryBuf, secondaryBufSize,
+						 "%sDefault: Raise%s   %sShift: Lower%s   %sCtrl: Set%s   %sCtrl+Shift: Smooth%s",
+						 defaultPrefix, defaultSuffix,
+						 shiftPrefix, shiftSuffix,
+						 ctrlPrefix, ctrlSuffix,
+		ctrlShiftPrefix, ctrlShiftSuffix);
+	}
+}
+
+Bool BrushTool::getBrushHintInfo(BrushHintInfo &info, char *hintTextBuf, Int hintTextBufSize, const CPoint &hintPos, Int lastBrushMode)
+{
+	info.shouldShow = false;
+	info.shouldClear = false;
+	info.hintPos = hintPos;
+	
+	if (!hintTextBuf || hintTextBufSize <= 0) {
+		return false;
+	}
+	hintTextBuf[0] = '\0';
+	
+	Tool *pCurTool = WbApp()->getCurTool();
+	if (!pCurTool || pCurTool->getToolID() != ID_BRUSH_TOOL) {
+		info.shouldClear = true;
+		return false;
+	}
+	
+	if (::GetAsyncKeyState(VK_LBUTTON) & 0x8000) {
+		info.shouldClear = true;
+		return false;
+	}
+	
+	info.currentMode = getPreviewModeFromKeys();
+	info.modeInt = (Int)info.currentMode;
+	
+	char primaryBuf[256];
+	char secondaryBuf[512];
+	getModeHintStrings(primaryBuf, sizeof(primaryBuf), secondaryBuf, sizeof(secondaryBuf));
+	
+	// Prefer secondary buffer (full hint) if available, otherwise use primary (current mode)
+	const char* hintText = NULL;
+	if (secondaryBuf && strlen(secondaryBuf) > 0) {
+		hintText = secondaryBuf;
+	} else if (primaryBuf && strlen(primaryBuf) > 0) {
+		hintText = primaryBuf;
+	}
+	
+	if (!hintText || strlen(hintText) == 0) {
+		info.shouldClear = true;
+		return false;
+	}
+	
+	strlcpy(hintTextBuf, hintText, hintTextBufSize);
+	info.shouldShow = true;
+	return true;
+}
+
+void BrushTool::applySmoothingAlgorithm(
+	WorldHeightMapEdit *editMap,
+	WorldHeightMapEdit *featherMap,
+	Int i, Int j,
+	Int rate,
+	Int smoothRadius,
+	Int minRadius,
+	Int maxRadius,
+	CWorldBuilderDoc *pDoc)
+{
+	if (i < 0 || i >= editMap->getXExtent() || j < 0 || j >= editMap->getYExtent()) {
+		return;
+	}
+	
+	Int radius = clamp(minRadius, smoothRadius, maxRadius);
+	
+	Int total = 0;
+	Real numSamples = 0;
+	
+	for (Int ii = i - radius; ii < i + radius + 1; ii++) {
+		for (Int jj = j - radius; jj < j + radius + 1; jj++) {
+			Real factor;
+			if (i == ii && j == jj) {
+				factor = 1.0f;
+			} else {
+				Real dist = sqrt((Real)((ii - i) * (ii - i) + (jj - j) * (jj - j)));
+				dist = max(1.0f, dist);
+				factor = (dist > radius) ? 0.0f : 1.0f - (dist - 1) / radius;
+			}
+			
+			int iNdx = clamp(0, ii, editMap->getXExtent() - 1);
+			int jNdx = clamp(0, jj, editMap->getYExtent() - 1);
+			
+			total += featherMap->getHeight(iNdx, jNdx);
+			numSamples += 1;
+		}
+	}
+	
+	total = (Int)floor(total / numSamples);
+	UnsignedByte origHeight = featherMap->getHeight(i, j);
+	float rateF = rate / 255.0f;
+	total = (Int)floor(origHeight * (1.0f - rateF) + total * rateF + 0.5f);
+	editMap->setHeight(i, j, total);
+	pDoc->invalCell(i, j);
+}
+
+Bool BrushTool::applyBrushWithRateAccumulation(
+	WorldHeightMapEdit *editMap,
+	WorldHeightMapEdit *featherMap,
+	WorldHeightMapEdit *rateMap,
+	const CPoint &ndx,
+	Int brushWidth,
+	Int rateMultiplier,
+	Int smoothRadius,
+	Int minRadius,
+	Int maxRadius,
+	CWorldBuilderDoc *pDoc)
+{
+	if (!editMap || !featherMap || !rateMap) return false;
+
+	Int sub = brushWidth / 2;
+	Int add = brushWidth - sub;
+	Bool rateOverflow = false;
+	Int xExtent = editMap->getXExtent();
+	Int yExtent = editMap->getYExtent();
+
+	for (Int i = ndx.x - sub; i < ndx.x + add; i++) {
+		if (i < 0 || i >= xExtent) continue;
+		
+		for (Int j = ndx.y - sub; j < ndx.y + add; j++) {
+			if (j < 0 || j >= yExtent) continue;
+			
+			Real blendFactor = calcRoundBlendFactor(ndx, i, j, brushWidth, 0);
+			if (blendFactor <= 0.0f) continue;
+			
+			Int rate = rateMap->getHeight(i, j);
+			rate += (Int)(blendFactor * rateMultiplier);
+			if (rate > 255) {
+				rate = 255;
+				rateOverflow = true;
+			}
+			rateMap->setHeight(i, j, rate);
+			
+			applySmoothingAlgorithm(editMap, featherMap, i, j, rate,
+				smoothRadius, minRadius, maxRadius, pDoc);
+		}
+	}
+	
+	return rateOverflow;
+}
+
+void BrushTool::resetSmoothingBuffers(
+	WorldHeightMapEdit *editMap,
+	WorldHeightMapEdit *featherMap,
+	WorldHeightMapEdit *rateMap)
+{
+	if (!editMap || !featherMap || !rateMap) return;
+
+	Int size = rateMap->getXExtent() * rateMap->getYExtent();
+	UnsignedByte *pRate = rateMap->getDataPtr();
+	UnsignedByte *pFeather = featherMap->getDataPtr();
+	UnsignedByte *pEdit = editMap->getDataPtr();
+	
+	for (Int i = 0; i < size; i++) {
+		*pRate++ = 0;
+		*pFeather++ = *pEdit++;
+	}
+}
+
+IRegion2D BrushTool::makePartialRange(const CPoint &ndx, Int brushWidth)
+{
+	IRegion2D range;
+	range.lo.x = ndx.x - brushWidth;
+	range.hi.x = ndx.x + brushWidth;
+	range.lo.y = ndx.y - brushWidth;
+	range.hi.y = ndx.y + brushWidth;
+	return range;
+}
+
+Real BrushTool::calcBlendFactor(const CPoint &ndx, Int i, Int j, Int width, Int feather, Bool square)
+{
+	if (square) {
+		return calcSquareBlendFactor(ndx, i, j, width, feather);
+	}
+	return calcRoundBlendFactor(ndx, i, j, width, feather);
+}
+
+Int BrushTool::getEffectiveBrushWidth(Int baseWidth, Int feather)
+{
+	Int width = baseWidth;
+	if (feather > 0) {
+		width += 2 * feather;
+	}
+	return width + 2;
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/FeatherTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/FeatherTool.cpp
index b50fbd0d40..6351be6d86 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/FeatherTool.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/FeatherTool.cpp
@@ -31,6 +31,7 @@
 #include "WHeightMapEdit.h"
 #include "WorldBuilderDoc.h"
 #include "WorldBuilderView.h"
+#include "BrushTool.h"
 //
 // FeatherTool class.
 Int FeatherTool::m_feather = 0;
@@ -144,104 +145,20 @@ void FeatherTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWor
 	DrawObject::setFeedbackPos(cpt);
 	if (m != TRACK_L) return;
 
-	int brushWidth = m_feather;
-
 	CPoint ndx;
 	getCenterIndex(&cpt, m_feather, &ndx, pDoc);
 
-	//if (m_prevXIndex == ndx.x && m_prevYIndex == ndx.y) return;
-
 	m_prevXIndex = ndx.x;
 	m_prevYIndex = ndx.y;
 
-	int sub = brushWidth/2;
-	int add = brushWidth-sub;
-
-	// round brush
-	Int i, j;
-	Bool redoRate = false;
-
-	for (i= ndx.x-sub; i< ndx.x+add; i++) {
-		if (i<0 || i>=m_htMapEditCopy->getXExtent()) {
-			continue;
-		}
-		for (j=ndx.y-sub; j<ndx.y+add; j++) {
-			if (j<0 || j>=m_htMapEditCopy->getYExtent()) {
-				continue;
-			}
-			Real blendFactor;
-			blendFactor = calcRoundBlendFactor(ndx, i, j, m_feather, 0);
-			// m_htMapEditCopy is the output.
-			// m_htMapFeatherCopy is the original input.
-			// m_htMapRateCopy is how much we use of the feathered data.
-			if (blendFactor > 0.0f) {
-				Int rate = m_htMapRateCopy->getHeight(i, j);
-				rate += blendFactor * m_rate*5;
-				if (rate>255) {
-					rate = 255;
-					redoRate = true;
-				}
-				m_htMapRateCopy->setHeight(i,j,rate);
-				Int total=0;
-				Real numSamples=0;
-				Int ii, jj;
-				Int radius = m_radius;
-				if (radius<1) radius=1;
-				if (radius>FeatherOptions::MAX_RADIUS) radius = FeatherOptions::MAX_RADIUS;
-				for (ii = i-radius; ii < i+radius+1; ii++) {
-					for (jj = j-radius; jj<j+radius+1; jj++) {
-						Real factor;
-						if (i==ii && j==jj) {
-							factor = 1.0f;
-						} else {
-							Real dist = sqrt((ii-i)*(ii-i)+(jj-j)*(jj-j));
-							if (dist<1.0) dist = 1.0;
-							if (dist>radius) {
-								factor = 0;
-							} else {
-								factor = 1.0f - (dist-1)/radius;
-							}
-						}
-						int iNdx = ii;
-						if (iNdx<0) iNdx = 1;
-						if (iNdx >=m_htMapEditCopy->getXExtent()) {
-							iNdx = m_htMapEditCopy->getXExtent()-1;
-						}
-						int jNdx = jj;
-						if (jNdx<0) jNdx = 1;
-						if (jNdx >=m_htMapEditCopy->getYExtent()) {
-							jNdx = m_htMapEditCopy->getYExtent()-1;
-						}
-						total += m_htMapFeatherCopy->getHeight(iNdx, jNdx);
-						numSamples+=1;
-					}
-				}
-				total = floor((total/numSamples));
-				UnsignedByte origHeight =  m_htMapFeatherCopy->getHeight(i, j);
-				float rateF = rate/255.0;
-				total = floor(origHeight*(1.0f-rateF) + total*rateF + 0.5f);
-				m_htMapEditCopy->setHeight(i, j, total);
-				pDoc->invalCell(i, j);
-			}
-		}
-	}
+	Bool redoRate = BrushTool::applyBrushWithRateAccumulation(
+		m_htMapEditCopy, m_htMapFeatherCopy, m_htMapRateCopy,
+		ndx, m_feather, m_rate * 5,
+		m_radius, 1, FeatherOptions::MAX_RADIUS, pDoc);
 
-	IRegion2D partialRange;
-	partialRange.lo.x = ndx.x - brushWidth;
-	partialRange.hi.x = ndx.x + brushWidth;
-	partialRange.lo.y = ndx.y - brushWidth;
-	partialRange.hi.y = ndx.y + brushWidth;
-	pDoc->updateHeightMap(m_htMapEditCopy, true, partialRange);
+	pDoc->updateHeightMap(m_htMapEditCopy, true, BrushTool::makePartialRange(ndx, m_feather));
+	
 	if (redoRate) {
-		Int size = m_htMapRateCopy->getXExtent() * m_htMapRateCopy->getYExtent();
-		UnsignedByte *pData = m_htMapRateCopy->getDataPtr();
-		UnsignedByte *pFeather = m_htMapFeatherCopy->getDataPtr();
-		UnsignedByte *pEdit = m_htMapEditCopy->getDataPtr();
-		Int i;
-		for (i=0; i<size; i++) {
-			*pData++ = 0;
-			*pFeather = *pEdit;
-			pFeather++; pEdit++;
-		}
+		BrushTool::resetSmoothingBuffers(m_htMapEditCopy, m_htMapFeatherCopy, m_htMapRateCopy);
 	}
 }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
index d4459af550..e09a7552f5 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
@@ -566,16 +566,12 @@ void CWorldBuilderApp::updateCurTool(Bool forceHand)
 	DEBUG_ASSERTCRASH((m_lockCurTool>=0),("oops"));
 	if (!m_lockCurTool) {	 // don't change tools that are doing something.
 		if (forceHand || (0x8000 & ::GetAsyncKeyState(VK_SPACE))) {
-			// Space bar gives scroll hand.
 			m_curTool = &m_handScrollTool;
 		} else if (0x8000 & ::GetAsyncKeyState(VK_MENU)) {
-			// Alt key gives eyedropper.
 			m_curTool = &m_eyedropperTool;
-		} else if (0x8000 & ::GetAsyncKeyState(VK_CONTROL)) {
-			// Control key gives pointer.
+		} else if (0x8000 & ::GetAsyncKeyState('W')) {
 			m_curTool = &m_pointerTool;
 		} else {
-			// Else the tool selected in the tool palette.
 			m_curTool = m_selTool;
 		}
 	}
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderView.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderView.cpp
index 2f9c4a74bc..159e6c763c 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderView.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderView.cpp
@@ -55,6 +55,8 @@
 #include "MainFrm.h"
 #include "CUndoable.h"
 #include "Common/Debug.h"
+#include "BrushTool.h"
+#include "DrawObject.h"
 
 //-----------------------------------------------------------------------------
 //         Private Data
@@ -309,6 +311,7 @@ void CWorldBuilderView::OnPaint()
 
 
 	CPaintDC dc(this); // device context for painting
+	m_brushHintState.beginFrame();
 	// Offset the origin so that we can draw on 0 based coordinates.
 	dc.SetViewportOrg(-mXScrollOffset, -mYScrollOffset);
 	updateRgn.OffsetRgn(mXScrollOffset, mYScrollOffset);
@@ -406,6 +409,8 @@ void CWorldBuilderView::OnPaint()
 		}
 	}
 
+	// Draw brush mode hint (only if in update region or needs update)
+	drawBrushModeHint(&dc, &updateRgn);
 }
 
 
@@ -1015,6 +1020,7 @@ BEGIN_MESSAGE_MAP(CWorldBuilderView, WbView)
 	ON_WM_CREATE()
 	ON_COMMAND(ID_VIEW_SHOWTEXTURE, OnViewShowtexture)
 	ON_UPDATE_COMMAND_UI(ID_VIEW_SHOWTEXTURE, OnUpdateViewShowtexture)
+	ON_WM_MOUSEMOVE()
 //	ON_COMMAND(ID_VIEW_SHOWCONTOURS, OnViewShowcontours)
 //	ON_UPDATE_COMMAND_UI(ID_VIEW_SHOWCONTOURS, OnUpdateViewShowcontours)
 	//}}AFX_MSG_MAP
@@ -1081,3 +1087,94 @@ DEBUG_ASSERTCRASH((abs(curPt.y-curPt2.y)<1),("oops"));
 	return true;
 }
 
+//=============================================================================
+// CWorldBuilderView::clearBrushModeHintState
+//=============================================================================
+/** Clears the brush mode hint state. */
+//=============================================================================
+void CWorldBuilderView::clearBrushModeHintState()
+{
+	m_brushHintState.reset();
+}
+
+//=============================================================================
+// CWorldBuilderView::drawBrushModeHint
+//=============================================================================
+/** Draws the brush mode hint on canvas near the brush cursor. */
+//=============================================================================
+void CWorldBuilderView::drawBrushModeHint(CDC *pDc, CRgn *pUpdateRgn)
+{
+	Coord3D brushPos = DrawObject::getFeedbackPos();
+	CPoint viewPt;
+	if (!docToViewCoords(brushPos, &viewPt)) {
+		clearBrushModeHintState();
+		return;
+	}
+
+	viewPt.x += mXScrollOffset;
+	viewPt.y += mYScrollOffset;
+
+	CPoint hintPos = viewPt;
+	hintPos.x += 20;
+	hintPos.y -= 20;
+
+	char hintTextBuf[512];
+	BrushTool::BrushHintInfo info;
+	if (!BrushTool::getBrushHintInfo(info, hintTextBuf, sizeof(hintTextBuf), hintPos, m_brushHintState.lastMode)) {
+		if (info.shouldClear) {
+			clearBrushModeHintState();
+		}
+		return;
+	}
+
+	if (!info.shouldShow || strlen(hintTextBuf) == 0) {
+		clearBrushModeHintState();
+		return;
+	}
+
+	const char* firstLine = hintTextBuf;
+	Int firstLineLen = (Int)strlen(firstLine);
+	Bool needUpdate = m_brushHintState.needsUpdate(hintPos, info.modeInt);
+
+	CSize textSize = pDc->GetTextExtent(firstLine, firstLineLen);
+	
+	if (!needUpdate && !m_brushHintState.lastRect.IsRectEmpty()) {
+		hintPos = m_brushHintState.lastPos;
+	}
+	
+	Int padding = 6;
+	CRect hintRect;
+	hintRect.left = hintPos.x - padding;
+	hintRect.top = hintPos.y - textSize.cy - padding;
+	hintRect.right = hintPos.x + textSize.cx + padding;
+	hintRect.bottom = hintPos.y + padding;
+	
+	if (pUpdateRgn && !needUpdate && !m_brushHintState.lastRect.IsRectEmpty()) {
+		CRect adjustedHintRect = hintRect;
+		adjustedHintRect.OffsetRect(-mXScrollOffset, -mYScrollOffset);
+		if (!pUpdateRgn->RectInRegion(&adjustedHintRect)) {
+			return;
+		}
+	}
+
+	COLORREF oldColor = pDc->SetTextColor(RGB(255, 255, 255));
+	Int oldBkMode = pDc->SetBkMode(TRANSPARENT);
+	
+	pDc->TextOut(hintPos.x, hintPos.y - textSize.cy, firstLine, firstLineLen);
+	
+	pDc->SetTextColor(oldColor);
+	pDc->SetBkMode(oldBkMode);
+
+	if (needUpdate) {
+		m_brushHintState.commitUpdate(hintPos, hintRect, info.modeInt);
+	}
+}
+
+//=============================================================================
+// CWorldBuilderView::OnMouseMove
+//=============================================================================
+void CWorldBuilderView::OnMouseMove(UINT nFlags, CPoint point)
+{
+	WbView::OnMouseMove(nFlags, point);
+}
+
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/brushoptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/brushoptions.cpp
index f8c50586f1..3cf825ecd7 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/brushoptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/brushoptions.cpp
@@ -30,6 +30,9 @@ BrushOptions *BrushOptions::m_staticThis = NULL;
 Int BrushOptions::m_currentWidth = 0;
 Int BrushOptions::m_currentHeight = 0;
 Int BrushOptions::m_currentFeather = 0;
+Int BrushOptions::m_currentRaiseLower = BrushTool::MIN_RAISE_LOWER;
+Int BrushOptions::m_currentSmoothRadius = BrushTool::MIN_SMOOTH_RADIUS;
+Int BrushOptions::m_currentSmoothRate = BrushTool::MIN_SMOOTH_RATE;
 /////////////////////////////////////////////////////////////////////////////
 /// BrushOptions dialog trivial construstor - Create does the real work.
 
@@ -87,6 +90,42 @@ void BrushOptions::setHeight(Int height)
 	}
 }
 
+void BrushOptions::setRaiseLowerAmount(Int amount)
+{
+	char buffer[_MAX_PATH];
+	snprintf(buffer, ARRAY_SIZE(buffer), "%d", amount);
+	m_currentRaiseLower = amount;
+	if (m_staticThis && !m_staticThis->m_updating) {
+		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_RAISELOWER_EDIT);
+		if (pEdit) pEdit->SetWindowText(buffer);
+		snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentRaiseLower*MAP_HEIGHT_SCALE);
+		pEdit = m_staticThis->GetDlgItem(IDC_RAISELOWER_LABEL);
+		if (pEdit) pEdit->SetWindowText(buffer);
+	}
+}
+
+void BrushOptions::setSmoothRadius(Int radius)
+{
+	CString buf;
+	buf.Format("%d", radius);
+	m_currentSmoothRadius = radius;
+	if (m_staticThis && !m_staticThis->m_updating) {
+		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_RADIUS_EDIT);
+		if (pEdit) pEdit->SetWindowText(buf);
+	}
+}
+
+void BrushOptions::setSmoothRate(Int rate)
+{
+	CString buf;
+	buf.Format("%d", rate);
+	m_currentSmoothRate = rate;
+	if (m_staticThis && !m_staticThis->m_updating) {
+		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_RATE_EDIT);
+		if (pEdit) pEdit->SetWindowText(buf);
+	}
+}
+
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -103,6 +142,9 @@ BOOL BrushOptions::OnInitDialog()
 	m_brushWidthPopup.SetupPopSliderButton(this, IDC_SIZE_POPUP, this);
 	m_brushFeatherPopup.SetupPopSliderButton(this, IDC_FEATHER_POPUP, this);
 	m_brushHeightPopup.SetupPopSliderButton(this, IDC_HEIGHT_POPUP, this);
+	m_raiseLowerPopup.SetupPopSliderButton(this, IDC_RAISELOWER_POPUP, this);
+	m_smoothRadiusPopup.SetupPopSliderButton(this, IDC_RADIUS_POPUP, this);
+	m_smoothRatePopup.SetupPopSliderButton(this, IDC_RATE_POPUP, this);
 
 
 	m_staticThis = this;
@@ -110,6 +152,9 @@ BOOL BrushOptions::OnInitDialog()
 	setFeather(m_currentFeather);
 	setWidth(m_currentWidth);
 	setHeight(m_currentHeight);
+	setRaiseLowerAmount(m_currentRaiseLower);
+	setSmoothRadius(m_currentSmoothRadius);
+	setSmoothRate(m_currentSmoothRate);
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
@@ -183,6 +228,60 @@ void BrushOptions::OnChangeHeightEdit()
 		}
 }
 
+void BrushOptions::OnChangeRaiseLowerEdit()
+{
+		if (m_updating) return;
+		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_RAISELOWER_EDIT);
+		char buffer[_MAX_PATH];
+		if (pEdit) {
+			pEdit->GetWindowText(buffer, sizeof(buffer));
+			Int amount;
+			m_updating = true;
+			if (1==sscanf(buffer, "%d", &amount)) {
+				m_currentRaiseLower = amount;
+				BrushTool::setRaiseLowerAmount(m_currentRaiseLower);
+				snprintf(buffer, ARRAY_SIZE(buffer), "%.1f FEET.", m_currentRaiseLower*MAP_HEIGHT_SCALE);
+				pEdit = m_staticThis->GetDlgItem(IDC_RAISELOWER_LABEL);
+				if (pEdit) pEdit->SetWindowText(buffer);
+			}
+			m_updating = false;
+		}
+}
+
+void BrushOptions::OnChangeSmoothRadiusEdit()
+{
+		if (m_updating) return;
+		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_RADIUS_EDIT);
+		char buffer[_MAX_PATH];
+		if (pEdit) {
+			pEdit->GetWindowText(buffer, sizeof(buffer));
+			Int radius;
+			m_updating = true;
+			if (1==sscanf(buffer, "%d", &radius)) {
+				m_currentSmoothRadius = radius;
+				BrushTool::setSmoothRadius(m_currentSmoothRadius);
+			}
+			m_updating = false;
+		}
+}
+
+void BrushOptions::OnChangeSmoothRateEdit()
+{
+		if (m_updating) return;
+		CWnd *pEdit = m_staticThis->GetDlgItem(IDC_RATE_EDIT);
+		char buffer[_MAX_PATH];
+		if (pEdit) {
+			pEdit->GetWindowText(buffer, sizeof(buffer));
+			Int rate;
+			m_updating = true;
+			if (1==sscanf(buffer, "%d", &rate)) {
+				m_currentSmoothRate = rate;
+				BrushTool::setSmoothRate(m_currentSmoothRate);
+			}
+			m_updating = false;
+		}
+}
+
 void BrushOptions::GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial)
 {
 	switch (sliderID) {
@@ -208,6 +307,27 @@ void BrushOptions::GetPopSliderInfo(const long sliderID, long *pMin, long *pMax,
 			*pLineSize = 1;
 			break;
 
+		case IDC_RAISELOWER_POPUP:
+			*pMin = BrushTool::MIN_RAISE_LOWER;
+			*pMax = BrushTool::MAX_RAISE_LOWER;
+			*pInitial = m_currentRaiseLower;
+			*pLineSize = 1;
+			break;
+
+		case IDC_RADIUS_POPUP:
+			*pMin = BrushTool::MIN_SMOOTH_RADIUS;
+			*pMax = BrushTool::MAX_SMOOTH_RADIUS;
+			*pInitial = m_currentSmoothRadius;
+			*pLineSize = 1;
+			break;
+
+		case IDC_RATE_POPUP:
+			*pMin = BrushTool::MIN_SMOOTH_RATE;
+			*pMax = BrushTool::MAX_SMOOTH_RATE;
+			*pInitial = m_currentSmoothRate;
+			*pLineSize = 1;
+			break;
+
 		default:
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
@@ -245,6 +365,30 @@ void BrushOptions::PopSliderChanged(const long sliderID, long theVal)
 			BrushTool::setFeather(m_currentFeather);
 			break;
 
+		case IDC_RAISELOWER_POPUP:
+			m_currentRaiseLower = theVal;
+			str.Format("%d", m_currentRaiseLower);
+			pEdit = m_staticThis->GetDlgItem(IDC_RAISELOWER_EDIT);
+			if (pEdit) pEdit->SetWindowText(str);
+			BrushTool::setRaiseLowerAmount(m_currentRaiseLower);
+			break;
+
+		case IDC_RADIUS_POPUP:
+			m_currentSmoothRadius = theVal;
+			str.Format("%d", m_currentSmoothRadius);
+			pEdit = m_staticThis->GetDlgItem(IDC_RADIUS_EDIT);
+			if (pEdit) pEdit->SetWindowText(str);
+			BrushTool::setSmoothRadius(m_currentSmoothRadius);
+			break;
+
+		case IDC_RATE_POPUP:
+			m_currentSmoothRate = theVal;
+			str.Format("%d", m_currentSmoothRate);
+			pEdit = m_staticThis->GetDlgItem(IDC_RATE_EDIT);
+			if (pEdit) pEdit->SetWindowText(str);
+			BrushTool::setSmoothRate(m_currentSmoothRate);
+			break;
+
 		default:
 			// uh-oh!
 			DEBUG_CRASH(("Slider message from unknown control"));
@@ -261,6 +405,12 @@ void BrushOptions::PopSliderFinished(const long sliderID, long theVal)
 			break;
 		case IDC_FEATHER_POPUP:
 			break;
+	case IDC_RAISELOWER_POPUP:
+			break;
+	case IDC_RADIUS_POPUP:
+			break;
+	case IDC_RATE_POPUP:
+			break;
 
 		default:
 			// uh-oh!
@@ -276,6 +426,9 @@ BEGIN_MESSAGE_MAP(BrushOptions, COptionsPanel)
 	ON_EN_CHANGE(IDC_FEATHER_EDIT, OnChangeFeatherEdit)
 	ON_EN_CHANGE(IDC_SIZE_EDIT, OnChangeSizeEdit)
 	ON_EN_CHANGE(IDC_HEIGHT_EDIT, OnChangeHeightEdit)
+	ON_EN_CHANGE(IDC_RAISELOWER_EDIT, OnChangeRaiseLowerEdit)
+	ON_EN_CHANGE(IDC_RADIUS_EDIT, OnChangeSmoothRadiusEdit)
+	ON_EN_CHANGE(IDC_RATE_EDIT, OnChangeSmoothRateEdit)
 	ON_WM_HSCROLL()
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview.cpp
index c0e65b35e2..7550f2bfac 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview.cpp
@@ -35,6 +35,8 @@
 #include "playerlistdlg.h"
 #include "teamsdialog.h"
 #include "LayersList.h"
+#include "BrushTool.h"
+#include "Lib/BaseType.h"
 
 Bool WbView::m_snapToGrid = false;
 
@@ -139,6 +141,7 @@ BEGIN_MESSAGE_MAP(WbView, CView)
 	ON_COMMAND(ID_VIEW_SHOW_TERRAIN, OnShowTerrain)
 	ON_UPDATE_COMMAND_UI(ID_VIEW_SHOW_TERRAIN, OnUpdateShowTerrain)
 	ON_WM_CREATE()
+	ON_WM_MOUSEWHEEL()
 
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
@@ -1083,3 +1086,49 @@ void WbView::rulerFeedbackInfo(Coord3D &point1, Coord3D &point2, Real dist)
 	m_rulerPoints[1] = point2;
 	m_rulerLength = dist;
 }
+
+// ----------------------------------------------------------------------------
+BOOL WbView::OnMouseWheel(UINT nFlags, short zDelta, CPoint point)
+{
+	if (handleBrushMouseWheel(nFlags, zDelta)) {
+		return TRUE;
+	}
+	
+	return CView::OnMouseWheel(nFlags, zDelta, point);
+}
+
+// ----------------------------------------------------------------------------
+Bool WbView::handleBrushMouseWheel(UINT nFlags, short zDelta)
+{
+	Tool *pCurTool = WbApp()->getCurTool();
+	if (pCurTool && pCurTool->getToolID() == ID_BRUSH_TOOL) {
+		Bool shiftDown = (nFlags & MK_SHIFT) != 0;
+		Bool ctrlDown = (nFlags & MK_CONTROL) != 0;
+		
+		if (shiftDown && !ctrlDown) {
+			Int currentWidth = BrushTool::getWidth();
+			Int delta = zDelta > 0 ? 1 : -1;
+			Int newWidth = clamp(1, currentWidth + delta, 100);
+			BrushTool::setWidth(newWidth);
+			
+			CString statusText;
+			statusText.Format("Brush Width: %d", newWidth);
+			CMainFrame::GetMainFrame()->SetMessageText(statusText);
+			
+			return TRUE;
+		} else if (ctrlDown && !shiftDown) {
+			Int currentFeather = BrushTool::getFeather();
+			Int delta = zDelta > 0 ? 1 : -1;
+			Int newFeather = clamp(0, currentFeather + delta, 100);
+			BrushTool::setFeather(newFeather);
+			
+			CString statusText;
+			statusText.Format("Brush Feather: %d", newFeather);
+			CMainFrame::GetMainFrame()->SetMessageText(statusText);
+			
+			return TRUE;
+		}
+	}
+	
+	return FALSE;
+}
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp
index c33edb6fee..6ddb2b5c5a 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp
@@ -71,6 +71,7 @@
 #include "W3DDevice/Common/W3DConvert.h"
 #include "W3DDevice/GameClient/W3DShadow.h"
 #include "DrawObject.h"
+#include "BrushTool.h"
 #include "Common/MapObject.h"
 #include "Common/GlobalData.h"
 #include "ShadowOptions.h"
@@ -406,7 +407,7 @@ WbView3d::WbView3d() :
 	m_showWeaponRanges(false),
 	m_highlightTestArt(false),
 	m_showLetterbox(false),
-  m_showSoundCircles(false)
+	m_showSoundCircles(false)
 {
 	TheTacticalView = &bogusTacticalView;
 	m_actualWinSize.x = ::AfxGetApp()->GetProfileInt(MAIN_FRAME_SECTION, "Width", THREE_D_VIEW_WIDTH);
@@ -2144,6 +2145,7 @@ BEGIN_MESSAGE_MAP(WbView3d, WbView)
 	ON_WM_CREATE()
 	ON_WM_PAINT()
 	ON_WM_SIZE()
+	ON_WM_MOUSEMOVE()
 	ON_WM_MOUSEWHEEL()
 	ON_WM_TIMER()
 	ON_WM_DESTROY()
@@ -2352,6 +2354,8 @@ int WbView3d::OnCreate(LPCREATESTRUCT lpCreateStruct)
 // ----------------------------------------------------------------------------
 void WbView3d::OnPaint()
 {
+	// Reset hint drawn flag at start of paint cycle to prevent double-drawing
+	m_brushHintState.beginFrame();
 
 	PAINTSTRUCT ps;
 	HDC hdc = ::BeginPaint(m_hWnd, &ps);
@@ -2641,6 +2645,9 @@ void WbView3d::drawLabels(HDC hdc)
 			}
 		}
 	}
+
+	// Draw brush mode hint (only once per frame to prevent double-drawing)
+	drawBrushModeHint(hdc);
 }
 
 
@@ -2654,6 +2661,12 @@ void WbView3d::OnSize(UINT nType, int cx, int cy)
 // ----------------------------------------------------------------------------
 BOOL WbView3d::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt)
 {
+	// Check if brush tool should handle this first
+	if (handleBrushMouseWheel(nFlags, zDelta)) {
+		return TRUE;
+	}
+	
+	// Default behavior: camera zoom
 	if (m_trackingMode == TRACK_NONE) {
 
 		//WST 11/21/02 New Triple speed camera zoom request by designers
@@ -3253,3 +3266,106 @@ void WbView3d::OnUpdateViewShowSoundCircles(CCmdUI* pCmdUI)
   pCmdUI->SetCheck(m_showSoundCircles ? 1 : 0);
 }
 
+//=============================================================================
+// WbView3d::OnMouseMove
+//=============================================================================
+void WbView3d::OnMouseMove(UINT nFlags, CPoint point)
+{
+	WbView::OnMouseMove(nFlags, point);
+}
+
+//=============================================================================
+// WbView3d::clearBrushModeHintState
+//=============================================================================
+/** Clears the brush mode hint state. */
+//=============================================================================
+void WbView3d::clearBrushModeHintState()
+{
+	m_brushHintState.reset();
+}
+
+//=============================================================================
+// WbView3d::drawBrushModeHint
+//=============================================================================
+/** Draws the brush mode hint on canvas near the brush cursor in 3D view. */
+//=============================================================================
+void WbView3d::drawBrushModeHint(HDC hdc)
+{
+	if (m_brushHintState.drawnThisFrame) {
+		return;
+	}
+
+	Coord3D brushPos = DrawObject::getFeedbackPos();
+	
+	Vector3 worldPos, screenPos;
+	worldPos.Set(brushPos.x, brushPos.y, brushPos.z);
+	if (CameraClass::INSIDE_FRUSTUM != m_camera->Project(screenPos, worldPos)) {
+		clearBrushModeHintState();
+		return;
+	}
+
+	CRect rClient;
+	GetClientRect(&rClient);
+	Int sx, sy;
+	W3DLogicalScreenToPixelScreen(screenPos.X, screenPos.Y, &sx, &sy,
+		rClient.right - rClient.left, rClient.bottom - rClient.top);
+	CPoint hintPos;
+	hintPos.x = rClient.left + sx + 20;
+	hintPos.y = rClient.top + sy - 20;
+
+	char hintTextBuf[512];
+	BrushTool::BrushHintInfo info;
+	if (!BrushTool::getBrushHintInfo(info, hintTextBuf, sizeof(hintTextBuf), hintPos, m_brushHintState.lastMode)) {
+		if (info.shouldClear) {
+			clearBrushModeHintState();
+		}
+		return;
+	}
+
+	if (!info.shouldShow || strlen(hintTextBuf) == 0) {
+		clearBrushModeHintState();
+		return;
+	}
+
+	const char* firstLine = hintTextBuf;
+	Int firstLineLen = (Int)strlen(firstLine);
+	Bool needUpdate = m_brushHintState.needsUpdate(hintPos, info.modeInt);
+
+	SIZE textSize;
+	if (m3DFont && !hdc) {
+		textSize.cx = firstLineLen * 6;
+		textSize.cy = 16;
+	} else {
+		::GetTextExtentPoint32(hdc, firstLine, firstLineLen, &textSize);
+	}
+
+	CRect hintRect;
+	if (!needUpdate && !m_brushHintState.lastRect.IsRectEmpty()) {
+		hintPos = m_brushHintState.lastPos;
+		hintRect = m_brushHintState.lastRect;
+	} else {
+		Int padding = 6;
+		hintRect.left = hintPos.x - padding;
+		hintRect.top = hintPos.y - textSize.cy - padding;
+		hintRect.right = hintPos.x + textSize.cx + padding;
+		hintRect.bottom = hintPos.y + padding;
+	}
+
+	if (m3DFont && !hdc) {
+		RECT textRect = hintRect;
+		textRect.bottom = textRect.top + textSize.cy;
+		m3DFont->DrawText(firstLine, firstLineLen, &textRect,
+			DT_LEFT | DT_NOCLIP | DT_TOP | DT_SINGLELINE, 0xFFFFFFFF);
+	} else if (hdc) {
+		::SetBkMode(hdc, TRANSPARENT);
+		::SetTextColor(hdc, RGB(255, 255, 255));
+		
+		::TextOut(hdc, hintPos.x, hintPos.y - textSize.cy, firstLine, firstLineLen);
+	}
+
+	if (needUpdate) {
+		m_brushHintState.commitUpdate(hintPos, hintRect, info.modeInt);
+	} else {
+		m_brushHintState.drawnThisFrame = true;
+	}
+}