Merge branch 'ticket/17' into working

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "SDK-binary-VS2010"]
 	path = Build/VS2010/SDK-binary
-	url = http://urufoundry/gitblit/r/CWE-SDKs/SDK-binary-VS2010
+	url = https://foundry.openuru.org/gitblit/r/CWE-SDKs/SDK-binary-VS2010

Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp

@@ -107,7 +107,7 @@ void pyVaultPlayerInfoListNode::AddPlayer( UInt32 playerID )
 	if (HasPlayer(playerID) || !fNode)
 		return;
 
-	NetVaultNode* templateNode = NEWZERO(NetVaultNode);
+	NetVaultNode* templateNode = new NetVaultNode();
 	templateNode->IncRef();
 	templateNode->SetNodeType(plVault::kNodeType_PlayerInfo);
 	VaultPlayerInfoNode access(templateNode);

Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp

@@ -8663,9 +8663,10 @@ hsBool	plDXPipeline::IProcessMipmapLevels( plMipmap *mipmap, UInt32 &numLevels,
 			if( mipmap->IsCompressed() || !( fSettings.fD3DCaps & kCapsDoesSmallTextures ) )
 			{
 				mipmap->SetCurrLevel( maxLevel );
-				while( maxLevel > 0 && (( mipmap->GetCurrWidth() | mipmap->GetCurrHeight() ) & sizeMask) )
+				while( ( mipmap->GetCurrWidth() | mipmap->GetCurrHeight() ) & sizeMask )
 				{
 					maxLevel--;
+					hsAssert( maxLevel >= 0, "How was this ever compressed?" );
 					mipmap->SetCurrLevel( maxLevel );
 				}
 			}