exprot script material support added

soniccat · Jan 16, 2010 · be9d0c6 · be9d0c6
1 parent c039253
commit be9d0c6
Show file tree

Hide file tree

Showing 11 changed files with 27,781 additions and 1,236 deletions.
diff --git a/BlenderWork/exportScript b/BlenderWork/exportScript
diff --git a/BlenderWork/ground.blend b/BlenderWork/ground.blend
diff --git a/BlenderWork/ground.blend1 b/BlenderWork/ground.blend1
diff --git a/BlenderWork/ground2.jpg b/BlenderWork/ground2.jpg
diff --git a/BlenderWork/out.txt b/BlenderWork/out.txt
diff --git a/BlenderWork/scriptTest.blend b/BlenderWork/scriptTest.blend
diff --git a/BlenderWork/scriptTest.blend1 b/BlenderWork/scriptTest.blend1
diff --git a/src/3D/SEVertexGroup.cpp b/src/3D/SEVertexGroup.cpp
@@ -110,6 +110,8 @@ SEMaterialPtr SEVertexGroup::material()
 
 void SEVertexGroup::Draw()
 {
-	mMaterial->Use();
+	if( mMaterial.get() )
+		mMaterial->Use();
+
 	glDrawElements( GL_TRIANGLES, mIndexArraySize ,GL_UNSIGNED_SHORT, mIndexArray.get() );
 }
diff --git a/vs/GLUT_Window_Template.cpp b/vs/GLUT_Window_Template.cpp
@@ -96,7 +96,7 @@ void drawObject ()
 	//  Draw Icosahedron
 	//glutWireIcosahedron ();
 
-	SEMeshPtr mesh = SEObjectStore::sharedInstance()->GetMesh( "Cube" );
+	SEMeshPtr mesh = SEObjectStore::sharedInstance()->GetMesh( "Plane" );
 
 	static GLUquadric* quadr = gluNewQuadric();
 

diff --git a/vs/GLUT_Window_Template.suo b/vs/GLUT_Window_Template.suo
diff --git a/vs/objects/out.txt b/vs/objects/out.txt
@@ -1,5 +1,5 @@
 type Mesh
-name Cube
+name Plane
 vertexCount 236
 vert 0.500000 1.000000 0.000000
 vert 0.000000 1.000000 0.000000