Ogre: TestModel added, Texture-Bug in Materialloader fixed

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1195 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

code/OgreImporter.hpp

@@ -127,7 +127,6 @@ struct Bone
 	{return Name==std::string(rval.data); }
 
 	void CalculateBoneToWorldSpaceMatrix(std::vector<Bone>& Bones);
-	
 };
 
 

code/OgreMaterial.cpp

@@ -338,6 +338,7 @@ void OgreImporter::ReadTechnique(stringstream &ss, aiMaterial* NewMaterial)
 				}
 				else if(Line=="texture_unit")
 				{
+					getline(ss, RestOfLine);//ignore the rest of the line
 					ss >> Line;
 					if(Line!="{")
 						throw DeadlyImportError("empty texture unit!");

test/models/Ogre/TheThing/BlockMat.material

@@ -0,0 +1,39 @@
+
+// blender material: BlockMat
+material BlockMat 
+{
+    receive_shadows on
+    technique b2ogre_1331419912.514
+    {
+        pass b2ogre_1331419912.514
+        {
+            ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
+            diffuse 0.6400000190734865 0.6400000190734865 0.6400000190734865 1.0
+            specular 0.5 0.5 0.5 1.0 12.5
+            emissive 0.0 0.0 0.0 1.0
+            alpha_to_coverage off
+            colour_write on
+            cull_hardware clockwise
+            depth_check on
+            depth_func less_equal
+            depth_write on
+            illumination_stage 
+            light_clip_planes off
+            light_scissor off
+            lighting on
+            normalise_normals off
+            polygon_mode solid
+            scene_blend one zero
+            scene_blend_op add
+            shading gouraud
+            transparent_sorting on
+            texture_unit b2ogre_1331419912.514
+            {
+                texture Wrinkles.jpg
+                tex_address_mode wrap
+                scale 1.0 1.0
+                colour_op replace
+            }
+        }
+    }
+}