Merge with develop

--HG--
branch : compatibility-develop
hg/compatibility-develop
kervala 7 years ago
commit 45c88d64ba

@ -744,11 +744,6 @@ static INT_PTR CALLBACK CNelExportDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LP
} }
break; break;
case WM_LBUTTONDOWN:
case WM_LBUTTONUP:
case WM_MOUSEMOVE:
theCNelExport._Ip->RollupMouseMessage(hWnd,msg,wParam,lParam);
break;
default: default:
ret = FALSE; ret = FALSE;

@ -56,7 +56,7 @@ void CRadialVertices::init (INode *node, Mesh *mesh, TimeValue time, Interface &
string pivotName = CExportNel::getScriptAppData (_NodePtr, NEL3D_APPDATA_RADIAL_NORMAL_SM+app-NEL3D_RADIAL_FIRST_SM, ""); string pivotName = CExportNel::getScriptAppData (_NodePtr, NEL3D_APPDATA_RADIAL_NORMAL_SM+app-NEL3D_RADIAL_FIRST_SM, "");
// Active ? // Active ?
if (pivotName != "") if (!pivotName.empty())
{ {
// Add the mask // Add the mask
_SmoothingGroupMask |= (1<<app); _SmoothingGroupMask |= (1<<app);
@ -79,7 +79,7 @@ void CRadialVertices::init (INode *node, Mesh *mesh, TimeValue time, Interface &
{ {
// Output error message // Output error message
char msg[512]; char msg[512];
smprintf (msg, 512, "Can't find pivot node named %s", pivotName); smprintf (msg, 512, "Can't find pivot node named '%s'", pivotName.c_str());
nelExport.outputErrorMessage (msg); nelExport.outputErrorMessage (msg);
} }
} }

@ -231,12 +231,6 @@ INT_PTR CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
} }
return FALSE; return FALSE;
case WM_LBUTTONDOWN:
case WM_LBUTTONUP:
case WM_MOUSEMOVE:
ep->ip->RollupMouseMessage(hDlg, message, wParam, lParam);
return FALSE;
case WM_COMMAND: case WM_COMMAND:
/*switch (LOWORD(wParam)) /*switch (LOWORD(wParam))
{ {
@ -298,12 +292,6 @@ INT_PTR CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
} }
return FALSE; return FALSE;
case WM_LBUTTONDOWN:
case WM_LBUTTONUP:
case WM_MOUSEMOVE:
ep->ip->RollupMouseMessage(hDlg, message, wParam, lParam);
return FALSE;
case WM_COMMAND: case WM_COMMAND:
switch (LOWORD(wParam)) switch (LOWORD(wParam))
{ {
@ -446,12 +434,6 @@ INT_PTR CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
} }
return FALSE; return FALSE;
case WM_LBUTTONDOWN:
case WM_LBUTTONUP:
case WM_MOUSEMOVE:
ep->ip->RollupMouseMessage(hDlg, message, wParam, lParam);
return FALSE;
case WM_COMMAND: case WM_COMMAND:
if (LOWORD(wParam) >= IDC_SMOOTH_GRP1 && if (LOWORD(wParam) >= IDC_SMOOTH_GRP1 &&
LOWORD(wParam) <= IDC_SMOOTH_GRP32) LOWORD(wParam) <= IDC_SMOOTH_GRP32)

@ -363,12 +363,6 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
} }
break; break;
case WM_LBUTTONDOWN:
case WM_LBUTTONUP:
case WM_MOUSEMOVE:
ep->ip->RollupMouseMessage(hDlg, message, wParam, lParam);
return FALSE;
case WM_COMMAND: case WM_COMMAND:
switch (LOWORD(wParam)) switch (LOWORD(wParam))
{ {
@ -591,7 +585,7 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
break; break;
} }
return FALSE; return FALSE;
} }
// ------------------------------------------------------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------------------------------------------------------

@ -110,12 +110,6 @@ BOOL CALLBACK DefaultSOTProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
SetWindowLongPtr(hWnd,GWLP_USERDATA,lParam); SetWindowLongPtr(hWnd,GWLP_USERDATA,lParam);
break; break;
case WM_LBUTTONDOWN:
case WM_LBUTTONUP:
case WM_MOUSEMOVE:
if (ip) ip->RollupMouseMessage(hWnd,msg,wParam,lParam);
return FALSE;
default: default:
return FALSE; return FALSE;
} }

@ -133,12 +133,6 @@ INT_PTR CALLBACK PatchSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
CancelEditPatchModes(ep->ip); CancelEditPatchModes(ep->ip);
return FALSE; return FALSE;
case WM_LBUTTONDOWN:
case WM_LBUTTONUP:
case WM_MOUSEMOVE:
ep->ip->RollupMouseMessage(hDlg, message, wParam, lParam);
return FALSE;
case WM_COMMAND: case WM_COMMAND:
{ {
BOOL needRedraw = FALSE; BOOL needRedraw = FALSE;
@ -645,12 +639,6 @@ INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
} }
break; break;
case WM_LBUTTONDOWN:
case WM_LBUTTONUP:
case WM_MOUSEMOVE:
ep->ip->RollupMouseMessage(hDlg, message, wParam, lParam);
return FALSE;
case WM_COMMAND: case WM_COMMAND:
switch (LOWORD(wParam)) switch (LOWORD(wParam))
{ {

@ -128,12 +128,6 @@ BOOL CALLBACK DefaultSOTProc(
SetWindowLongPtr(hWnd,GWLP_USERDATA,lParam); SetWindowLongPtr(hWnd,GWLP_USERDATA,lParam);
break; break;
case WM_LBUTTONDOWN:
case WM_LBUTTONUP:
case WM_MOUSEMOVE:
if (ip) ip->RollupMouseMessage(hWnd,msg,wParam,lParam);
return FALSE;
default: default:
return FALSE; return FALSE;
} }

@ -65,12 +65,6 @@ INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
return TRUE; return TRUE;
} }
case WM_LBUTTONDOWN:
case WM_LBUTTONUP:
case WM_MOUSEMOVE:
ep->ip->RollupMouseMessage(hDlg, message, wParam, lParam);
return FALSE;
case WM_COMMAND: case WM_COMMAND:
switch (LOWORD(wParam)) switch (LOWORD(wParam))
{ {

@ -156,11 +156,6 @@ static INT_PTR CALLBACK Tile_utilityDlgProc(HWND hWnd, UINT msg, WPARAM wParam,
// load the sampler dropdown // load the sampler dropdown
theTile_utility.Destroy(hWnd); theTile_utility.Destroy(hWnd);
break; break;
case WM_LBUTTONDOWN:
case WM_LBUTTONUP:
case WM_MOUSEMOVE:
theTile_utility.ip->RollupMouseMessage(hWnd,msg,wParam,lParam);
break;
case WM_COMMAND: case WM_COMMAND:
{ {
int id = LOWORD(wParam); int id = LOWORD(wParam);

Loading…
Cancel
Save