Minor renderer updates.

2011-09-23 00:55:24 -05:00
parent c621cb7719
commit 7f934f34f1
5 changed files with 67 additions and 7 deletions
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -180,8 +180,10 @@ public:
 	
 	//reorder face list based on mMaterialList in this and reference so 
 	//order matches that of reference (material ordering touchup)
-	void matchMaterialOrder(LLModel* reference);
-
+	bool matchMaterialOrder(LLModel* ref, int& refFaceCnt, int& modelFaceCnt );
+	bool isMaterialListSubset( LLModel* ref );
+	bool needToAddFaces( LLModel* ref, int& refFaceCnt, int& modelFaceCnt );
+	
 	std::vector<std::string> mMaterialList;

 	//data used for skin weights