Remove return redundant logic.

vitimiti · vitimiti · commit 07cd34dd9176 · 2025-11-06T13:04:59.000Z
Remove all the redundant return logic I could find in the project. This should help resolve refactor #1778.
diff --git a/Core/Libraries/Source/WWVegas/WWDownload/FTP.cpp b/Core/Libraries/Source/WWVegas/WWDownload/FTP.cpp
@@ -1813,7 +1813,6 @@ void Cftp::GetDownloadFilename(const char *localname, char *downloadname)
 	name.replace(" ","_");
 	sprintf(downloadname,"download\\%s_%d.tmp",name.get(),m_iFileSize);
 	*/
-	return;
 }
 
 
diff --git a/Core/Tools/WW3D/max2w3d/GameMtl.cpp b/Core/Tools/WW3D/max2w3d/GameMtl.cpp
@@ -1081,7 +1081,6 @@ void GameMtl::SetReference(int i, RefTargetHandle rtarg)
 			int stage = offset % 2;
 			Texture[pass][stage] = (Texmap *)rtarg;
 		}
-		return;
 	}
 }
 
diff --git a/Core/Tools/WW3D/max2w3d/MeshDeform.cpp b/Core/Tools/WW3D/max2w3d/MeshDeform.cpp
@@ -152,7 +152,6 @@ MeshDeformClass::ModifyObject
 	tri_obj->UpdateValidity (GEOM_CHAN_NUM, Interval (time, time + 1));
 	tri_obj->UpdateValidity (SELECT_CHAN_NUM, Interval (time, time + 1));
 	tri_obj->UpdateValidity (SUBSEL_TYPE_CHAN_NUM, Interval (time, time + 1));
-	return ;
 }
 
 
@@ -257,7 +256,6 @@ MeshDeformClass::BeginEditParams
 	// Restore the selection level.
 	///
 	max_interface->SetSubObjectLevel (1);
-	return ;
 }
 
 
@@ -299,7 +297,6 @@ MeshDeformClass::EndEditParams
 	// Release our hold on the max interface pointer
 	m_MaxInterface = NULL;
 	m_pPanel = NULL;
-	return ;
 }
 
 
@@ -339,7 +336,6 @@ MeshDeformClass::ActivateSubobjSel
 	** display attributes, and subselection type channels have changed
 	*/
 	NotifyDependents(FOREVER, VERTCOLOR_CHANNEL|SELECT_CHANNEL|DISP_ATTRIB_CHANNEL|SUBSEL_TYPE_CHANNEL, REFMSG_CHANGE);
-	return ;
 }
 
 
@@ -453,7 +449,6 @@ MeshDeformClass::SelectSubComponent
 	m_pPanel->Update_Vertex_Color ();
 	NotifyDependents (FOREVER, PART_SELECT, REFMSG_CHANGE);
 	m_bSetDirty = true;
-	return ;
 }
 
 
@@ -472,7 +467,6 @@ MeshDeformClass::GetSubObjectTMs
 )
 {
 	int test = 0;
-	return ;
 }
 
 
@@ -509,7 +503,6 @@ MeshDeformClass::GetSubObjectCenters
 
 	// Pass the 'selection' center onto MAX
 	callback->Center (box.Center (), 0);
-	return ;
 }
 
 
@@ -544,7 +537,6 @@ MeshDeformClass::ClearSelection (int selLevel)
 	*/
 	NotifyDependents (FOREVER, PART_SELECT, REFMSG_CHANGE);
 	m_bSetDirty = true;
-	return ;
 }
 
 static Point3 last_delta;
@@ -618,7 +610,6 @@ MeshDeformClass::Move
 	}
 
 	m_OperationName = "Move";
-	return ;
 }
 
 
@@ -692,7 +683,6 @@ MeshDeformClass::Scale
 	}
 
 	m_OperationName = "Scale";
-	return ;
 }
 
 
@@ -772,7 +762,6 @@ MeshDeformClass::Rotate
 	}
 
 	m_OperationName = "Rotate";
-	return ;
 }
 
 
@@ -826,7 +815,6 @@ MeshDeformClass::TransformStart (TimeValue time_val)
 	// Repaint the view
 	nodes.DisposeTemporary ();
 	NotifyDependents (FOREVER, PART_GEOM, REFMSG_CHANGE);
-	return ;
 }
 
 
@@ -844,7 +832,6 @@ MeshDeformClass::TransformFinish (TimeValue time_val)
 
 	// Accept the undo operation
 	theHold.Accept (m_OperationName);
-	return ;
 }
 
 
@@ -862,7 +849,6 @@ MeshDeformClass::TransformCancel (TimeValue time_val)
 
 	// Cancel the undo operation
 	theHold.Cancel ();
-	return ;
 }
 
 
@@ -882,8 +868,6 @@ MeshDeformClass::Set_Deform_State (float state)
 			m_pPanel->Update_Vertex_Color ();
 		}
 	}
-
-	return ;
 }
 
 
@@ -961,7 +945,6 @@ MeshDeformClass::Set_Vertex_Color (const Point3 &color, bool button_up)
 	}
 
 	m_VertColorChanging = !button_up;
-	return ;
 }
 
 
@@ -1030,8 +1013,6 @@ MeshDeformClass::Get_Vertex_Color (Point3 &color)
 
 		nodes.DisposeTemporary ();
 	}
-
-	return ;
 }
 
 
@@ -1057,8 +1038,6 @@ MeshDeformClass::Update_UI (MeshDeformModData *mod_data)
 		m_pPanel->Set_Current_Set (m_CurrentSet);
 		m_pPanel->Set_Current_State (m_DeformState);
 	}
-
-	return ;
 }
 
 
@@ -1092,8 +1071,6 @@ MeshDeformClass::Auto_Apply (bool auto_apply)
 		// Cleanup
 		nodes.DisposeTemporary ();
 	}
-
-	return ;
 }
 
 
@@ -1137,8 +1114,6 @@ MeshDeformClass::Set_Max_Deform_Sets (int max)
 		NotifyDependents (FOREVER, PART_SELECT, REFMSG_CHANGE);
 		m_MaxInterface->RedrawViews (m_MaxInterface->GetTime ());
 	}
-
-	return ;
 }
 
 
@@ -1173,8 +1148,6 @@ MeshDeformClass::Update_Set_Count (void)
 		// Cleanup
 		nodes.DisposeTemporary ();
 	}
-
-	return ;
 }
 
 
@@ -1231,8 +1204,6 @@ MeshDeformClass::Set_Current_Set
 		// Update the current 'vertex color' on the UI panel
 		m_pPanel->Update_Vertex_Color ();
 	}
-
-	return ;
 }
 
 
@@ -1268,8 +1239,6 @@ MeshDeformClass::Update_Current_Set (void)
 		nodes.DisposeTemporary ();
 		m_bSetDirty = false;
 	}
-
-	return ;
 }
 
 
@@ -1332,7 +1301,6 @@ void SkinModifierClass::SelectAll(int selLevel)
 
 			case OBJECT_SEL_LEVEL:
 				assert(0);
-				return;
 
 			case VERTEX_SEL_LEVEL:
 #if 0 // undo/redo
@@ -1386,7 +1354,6 @@ void SkinModifierClass::InvertSelection(int selLevel)
 
 			case OBJECT_SEL_LEVEL:
 				assert(0);
-				return;
 
 			case VERTEX_SEL_LEVEL:
 #if 0 // undo/redo
diff --git a/Core/Tools/WW3D/max2w3d/skin.cpp b/Core/Tools/WW3D/max2w3d/skin.cpp
@@ -1138,7 +1138,6 @@ void SkinModifierClass::ClearSelection(int selLevel)
 #if 0
 			case OBJECT_SEL_LEVEL:
 				assert(0);
-				return;
 #endif
 
 			case VERTEX_SEL_LEVEL:
@@ -1194,7 +1193,6 @@ void SkinModifierClass::SelectAll(int selLevel)
 
 			case OBJECT_SEL_LEVEL:
 				assert(0);
-				return;
 
 			case VERTEX_SEL_LEVEL:
 #if 0 // undo/redo
@@ -1248,7 +1246,6 @@ void SkinModifierClass::InvertSelection(int selLevel)
 
 			case OBJECT_SEL_LEVEL:
 				assert(0);
-				return;
 
 			case VERTEX_SEL_LEVEL:
 #if 0 // undo/redo
diff --git a/Core/Tools/WW3D/max2w3d/util.cpp b/Core/Tools/WW3D/max2w3d/util.cpp
@@ -180,7 +180,6 @@ void Split_Node_Name(const char * name,char * set_base,char * set_exten,int * se
 
 		// no extension, just copy the base name
 		if (set_base != NULL) strncpy(set_base,buf,MAX_NODE_NAME_LEN);
-		return;
 	}
 }
 
diff --git a/Core/Tools/WW3D/max2w3d/vxl.cpp b/Core/Tools/WW3D/max2w3d/vxl.cpp
@@ -524,7 +524,6 @@ void VoxelClass::raw_set_vis(
 	if (k>=(int)ZDim) return;
 
 	VisData[i + j*XDim + k*XDim*YDim] = val;
-	return;
 }
 
 
diff --git a/Core/Tools/WW3D/max2w3d/w3dmtl.cpp b/Core/Tools/WW3D/max2w3d/w3dmtl.cpp
@@ -116,7 +116,6 @@ void W3dMapClass::Set_Anim_Info(const W3dTextureInfoStruct * info)
 		if (AnimInfo) {
 			delete AnimInfo;
 			AnimInfo = NULL;
-			return;
 		}
 	} else {
 		if (AnimInfo == NULL) {
diff --git a/Core/Tools/WW3D/pluglib/WWmatrix3.cpp b/Core/Tools/WW3D/pluglib/WWmatrix3.cpp
@@ -355,25 +355,22 @@ void Matrix3::Re_Orthogonalize(void)
 	if (len < WWMATH_EPSILON) {
 		Make_Identity();
 		return;
-	} else {
-		x /= len;
 	}
+	x /= len;
 
 	len = y.Length();
 	if (len < WWMATH_EPSILON) {
 		Make_Identity();
 		return;
-	} else {
-		y /= len;
 	}
+	y /= len;
 
 	len = z.Length();
 	if (len < WWMATH_EPSILON) {
 		Make_Identity();
 		return;
-	} else {
-		z /= len;
 	}
+	z /= len;
 
 	Row[0][0] = x.X;
 	Row[0][1] = x.Y;
diff --git a/Core/Tools/WW3D/pluglib/matrix3d.cpp b/Core/Tools/WW3D/pluglib/matrix3d.cpp
@@ -782,25 +782,22 @@ void Matrix3D::Re_Orthogonalize(void)
 	if (len < WWMATH_EPSILON) {
 		Make_Identity();
 		return;
-	} else {
-		x *= 1.0f/len;
 	}
+	x *= 1.0f/len;
 
 	len = y.Length();
 	if (len < WWMATH_EPSILON) {
 		Make_Identity();
 		return;
-	} else {
-		y *= 1.0f/len;
 	}
+	y *= 1.0f/len;
 
 	len = z.Length();
 	if (len < WWMATH_EPSILON) {
 		Make_Identity();
 		return;
-	} else {
-		z *= 1.0f/len;
 	}
+	z *= 1.0f/len;
 
 	Row[0][0] = x.X;
 	Row[0][1] = x.Y;
diff --git a/Core/Tools/WW3D/pluglib/w3dquat.cpp b/Core/Tools/WW3D/pluglib/w3dquat.cpp
@@ -116,12 +116,12 @@ void Quaternion::Normalize()
 
 	if (0.0f == mag) {
 		return;
-	} else {
-		X /= mag;
-		Y /= mag;
-		Z /= mag;
-		W /= mag;
 	}
+
+	X /= mag;
+	Y /= mag;
+	Z /= mag;
+	W /= mag;
 }
 
 /***********************************************************************************************

Original file line number	Diff line number	Diff line change
`@@ -1813,7 +1813,6 @@ void Cftp::GetDownloadFilename(const char localname, char downloadname)`
`1813`	`1813`	`name.replace(" ","_");`
`1814`	`1814`	`sprintf(downloadname,"download\\%s_%d.tmp",name.get(),m_iFileSize);`
`1815`	`1815`	`*/`
`1816`		`- return;`
`1817`	`1816`	`}`
`1818`	`1817`
`1819`	`1818`
Original file line number	Diff line number	Diff line change
`@@ -1081,7 +1081,6 @@ void GameMtl::SetReference(int i, RefTargetHandle rtarg)`
`1081`	`1081`	`int stage = offset % 2;`
`1082`	`1082`	`Texture[pass][stage] = (Texmap *)rtarg;`
`1083`	`1083`	`}`
`1084`		`- return;`
`1085`	`1084`	`}`
`1086`	`1085`	`}`
`1087`	`1086`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,6 @@ MeshDeformClass::ModifyObject`
`152`	`152`	`tri_obj->UpdateValidity (GEOM_CHAN_NUM, Interval (time, time + 1));`
`153`	`153`	`tri_obj->UpdateValidity (SELECT_CHAN_NUM, Interval (time, time + 1));`
`154`	`154`	`tri_obj->UpdateValidity (SUBSEL_TYPE_CHAN_NUM, Interval (time, time + 1));`
`155`		`- return ;`
`156`	`155`	`}`
`157`	`156`
`158`	`157`
`@@ -257,7 +256,6 @@ MeshDeformClass::BeginEditParams`
`257`	`256`	`// Restore the selection level.`
`258`	`257`	`///`
`259`	`258`	`max_interface->SetSubObjectLevel (1);`
`260`		`- return ;`
`261`	`259`	`}`
`262`	`260`
`263`	`261`
`@@ -299,7 +297,6 @@ MeshDeformClass::EndEditParams`
`299`	`297`	`// Release our hold on the max interface pointer`
`300`	`298`	`m_MaxInterface = NULL;`
`301`	`299`	`m_pPanel = NULL;`
`302`		`- return ;`
`303`	`300`	`}`
`304`	`301`
`305`	`302`
`@@ -339,7 +336,6 @@ MeshDeformClass::ActivateSubobjSel`
`339`	`336`	`** display attributes, and subselection type channels have changed`
`340`	`337`	`*/`
`341`	`338`	`NotifyDependents(FOREVER, VERTCOLOR_CHANNEL\|SELECT_CHANNEL\|DISP_ATTRIB_CHANNEL\|SUBSEL_TYPE_CHANNEL, REFMSG_CHANGE);`
`342`		`- return ;`
`343`	`339`	`}`
`344`	`340`
`345`	`341`
`@@ -453,7 +449,6 @@ MeshDeformClass::SelectSubComponent`
`453`	`449`	`m_pPanel->Update_Vertex_Color ();`
`454`	`450`	`NotifyDependents (FOREVER, PART_SELECT, REFMSG_CHANGE);`
`455`	`451`	`m_bSetDirty = true;`
`456`		`- return ;`
`457`	`452`	`}`
`458`	`453`
`459`	`454`
`@@ -472,7 +467,6 @@ MeshDeformClass::GetSubObjectTMs`
`472`	`467`	`)`
`473`	`468`	`{`
`474`	`469`	`int test = 0;`
`475`		`- return ;`
`476`	`470`	`}`
`477`	`471`
`478`	`472`
`@@ -509,7 +503,6 @@ MeshDeformClass::GetSubObjectCenters`
`509`	`503`
`510`	`504`	`// Pass the 'selection' center onto MAX`
`511`	`505`	`callback->Center (box.Center (), 0);`
`512`		`- return ;`
`513`	`506`	`}`
`514`	`507`
`515`	`508`
`@@ -544,7 +537,6 @@ MeshDeformClass::ClearSelection (int selLevel)`
`544`	`537`	`*/`
`545`	`538`	`NotifyDependents (FOREVER, PART_SELECT, REFMSG_CHANGE);`
`546`	`539`	`m_bSetDirty = true;`
`547`		`- return ;`
`548`	`540`	`}`
`549`	`541`
`550`	`542`	`static Point3 last_delta;`
`@@ -618,7 +610,6 @@ MeshDeformClass::Move`
`618`	`610`	`}`
`619`	`611`
`620`	`612`	`m_OperationName = "Move";`
`621`		`- return ;`
`622`	`613`	`}`
`623`	`614`
`624`	`615`
`@@ -692,7 +683,6 @@ MeshDeformClass::Scale`
`692`	`683`	`}`
`693`	`684`
`694`	`685`	`m_OperationName = "Scale";`
`695`		`- return ;`
`696`	`686`	`}`
`697`	`687`
`698`	`688`
`@@ -772,7 +762,6 @@ MeshDeformClass::Rotate`
`772`	`762`	`}`
`773`	`763`
`774`	`764`	`m_OperationName = "Rotate";`
`775`		`- return ;`
`776`	`765`	`}`
`777`	`766`
`778`	`767`
`@@ -826,7 +815,6 @@ MeshDeformClass::TransformStart (TimeValue time_val)`
`826`	`815`	`// Repaint the view`
`827`	`816`	`nodes.DisposeTemporary ();`
`828`	`817`	`NotifyDependents (FOREVER, PART_GEOM, REFMSG_CHANGE);`
`829`		`- return ;`
`830`	`818`	`}`
`831`	`819`
`832`	`820`
`@@ -844,7 +832,6 @@ MeshDeformClass::TransformFinish (TimeValue time_val)`
`844`	`832`
`845`	`833`	`// Accept the undo operation`
`846`	`834`	`theHold.Accept (m_OperationName);`
`847`		`- return ;`
`848`	`835`	`}`
`849`	`836`
`850`	`837`
`@@ -862,7 +849,6 @@ MeshDeformClass::TransformCancel (TimeValue time_val)`
`862`	`849`
`863`	`850`	`// Cancel the undo operation`
`864`	`851`	`theHold.Cancel ();`
`865`		`- return ;`
`866`	`852`	`}`
`867`	`853`
`868`	`854`
`@@ -882,8 +868,6 @@ MeshDeformClass::Set_Deform_State (float state)`
`882`	`868`	`m_pPanel->Update_Vertex_Color ();`
`883`	`869`	`}`
`884`	`870`	`}`
`885`		`-`
`886`		`- return ;`
`887`	`871`	`}`
`888`	`872`
`889`	`873`
`@@ -961,7 +945,6 @@ MeshDeformClass::Set_Vertex_Color (const Point3 &color, bool button_up)`
`961`	`945`	`}`
`962`	`946`
`963`	`947`	`m_VertColorChanging = !button_up;`
`964`		`- return ;`
`965`	`948`	`}`
`966`	`949`
`967`	`950`
`@@ -1030,8 +1013,6 @@ MeshDeformClass::Get_Vertex_Color (Point3 &color)`
`1030`	`1013`
`1031`	`1014`	`nodes.DisposeTemporary ();`
`1032`	`1015`	`}`
`1033`		`-`
`1034`		`- return ;`
`1035`	`1016`	`}`
`1036`	`1017`
`1037`	`1018`
`@@ -1057,8 +1038,6 @@ MeshDeformClass::Update_UI (MeshDeformModData *mod_data)`
`1057`	`1038`	`m_pPanel->Set_Current_Set (m_CurrentSet);`
`1058`	`1039`	`m_pPanel->Set_Current_State (m_DeformState);`
`1059`	`1040`	`}`
`1060`		`-`
`1061`		`- return ;`
`1062`	`1041`	`}`
`1063`	`1042`
`1064`	`1043`
`@@ -1092,8 +1071,6 @@ MeshDeformClass::Auto_Apply (bool auto_apply)`
`1092`	`1071`	`// Cleanup`
`1093`	`1072`	`nodes.DisposeTemporary ();`
`1094`	`1073`	`}`
`1095`		`-`
`1096`		`- return ;`
`1097`	`1074`	`}`
`1098`	`1075`
`1099`	`1076`
`@@ -1137,8 +1114,6 @@ MeshDeformClass::Set_Max_Deform_Sets (int max)`
`1137`	`1114`	`NotifyDependents (FOREVER, PART_SELECT, REFMSG_CHANGE);`
`1138`	`1115`	`m_MaxInterface->RedrawViews (m_MaxInterface->GetTime ());`
`1139`	`1116`	`}`
`1140`		`-`
`1141`		`- return ;`
`1142`	`1117`	`}`
`1143`	`1118`
`1144`	`1119`
`@@ -1173,8 +1148,6 @@ MeshDeformClass::Update_Set_Count (void)`
`1173`	`1148`	`// Cleanup`
`1174`	`1149`	`nodes.DisposeTemporary ();`
`1175`	`1150`	`}`
`1176`		`-`
`1177`		`- return ;`
`1178`	`1151`	`}`
`1179`	`1152`
`1180`	`1153`
`@@ -1231,8 +1204,6 @@ MeshDeformClass::Set_Current_Set`
`1231`	`1204`	`// Update the current 'vertex color' on the UI panel`
`1232`	`1205`	`m_pPanel->Update_Vertex_Color ();`
`1233`	`1206`	`}`
`1234`		`-`
`1235`		`- return ;`
`1236`	`1207`	`}`
`1237`	`1208`
`1238`	`1209`
`@@ -1268,8 +1239,6 @@ MeshDeformClass::Update_Current_Set (void)`
`1268`	`1239`	`nodes.DisposeTemporary ();`
`1269`	`1240`	`m_bSetDirty = false;`
`1270`	`1241`	`}`
`1271`		`-`
`1272`		`- return ;`
`1273`	`1242`	`}`
`1274`	`1243`
`1275`	`1244`
`@@ -1332,7 +1301,6 @@ void SkinModifierClass::SelectAll(int selLevel)`
`1332`	`1301`
`1333`	`1302`	`case OBJECT_SEL_LEVEL:`
`1334`	`1303`	`assert(0);`
`1335`		`- return;`
`1336`	`1304`
`1337`	`1305`	`case VERTEX_SEL_LEVEL:`
`1338`	`1306`	`#if 0 // undo/redo`
`@@ -1386,7 +1354,6 @@ void SkinModifierClass::InvertSelection(int selLevel)`
`1386`	`1354`
`1387`	`1355`	`case OBJECT_SEL_LEVEL:`
`1388`	`1356`	`assert(0);`
`1389`		`- return;`
`1390`	`1357`
`1391`	`1358`	`case VERTEX_SEL_LEVEL:`
`1392`	`1359`	`#if 0 // undo/redo`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,6 @@ void Split_Node_Name(const char * name,char * set_base,char * set_exten,int * se`
`180`	`180`
`181`	`181`	`// no extension, just copy the base name`
`182`	`182`	`if (set_base != NULL) strncpy(set_base,buf,MAX_NODE_NAME_LEN);`
`183`		`- return;`
`184`	`183`	`}`
`185`	`184`	`}`
`186`	`185`
Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,6 @@ void VoxelClass::raw_set_vis(`
`524`	`524`	`if (k>=(int)ZDim) return;`
`525`	`525`
`526`	`526`	`VisData[i + jXDim + kXDim*YDim] = val;`
`527`		`- return;`
`528`	`527`	`}`
`529`	`528`
`530`	`529`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,6 @@ void W3dMapClass::Set_Anim_Info(const W3dTextureInfoStruct * info)`
`116`	`116`	`if (AnimInfo) {`
`117`	`117`	`delete AnimInfo;`
`118`	`118`	`AnimInfo = NULL;`
`119`		`- return;`
`120`	`119`	`}`
`121`	`120`	`} else {`
`122`	`121`	`if (AnimInfo == NULL) {`