Procházet zdrojové kódy

Made xyzuv addVertex be the default addVertex for bindings, added none blending mode to blending mode drop down in material editor

Ivan Safrin před 12 roky
rodič
revize
289d46be7b

+ 2 - 2
Core/Contents/Include/PolyMesh.h

@@ -243,12 +243,12 @@ namespace Polycode {
 			*/
 			Vector3 recenterMesh();
 		
+            Vertex *addVertex(Number x, Number y, Number z, Number u, Number v);
+        
             Vertex *addVertex(Number x, Number y, Number z);
 			
             void addVertex(Vertex *vertex);
         
-            Vertex *addVertex(Number x, Number y, Number z, Number u, Number v);
-        
             Vertex *getVertex(unsigned int index) const;
 
             Vertex *getActualVertex(unsigned int index) const;

+ 2 - 1
IDE/Contents/Source/PolycodeMaterialEditor.cpp

@@ -848,7 +848,8 @@ MaterialEditorPane::MaterialEditorPane() : UIElement() {
 	blendModeProp = new ComboProp("Blend mode");
 	baseProps->addProp(blendModeProp);
 	blendModeProp->addEventListener(this, Event::CHANGE_EVENT);
-		
+
+	blendModeProp->comboEntry->addComboItem("None");
 	blendModeProp->comboEntry->addComboItem("Normal");
 	blendModeProp->comboEntry->addComboItem("Lighten");
 	blendModeProp->comboEntry->addComboItem("Color");