Fix #31258: collada now selects newly added objects after import.
[blender-staging.git] / source / blender / collada / MeshImporter.h
index 20fdb0dcc6e2ce35c07b7e4b86335deff7136300..97ae4d99ad7de2c2acd26ce2253b02dcc1354bee 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -26,8 +24,8 @@
  *  \ingroup collada
  */
 
-#ifndef __BC__MESHIMPORTER_H__
-#define __BC__MESHIMPORTER_H__
+#ifndef __MESHIMPORTER_H__
+#define __MESHIMPORTER_H__
 
 #include <map>
 #include <vector>
@@ -69,7 +67,7 @@ public:
        void print();
 #endif
 
-       void getUV(int uv_index[2], float *uv);
+       void getUV(int uv_index, float *uv);
 };
 
 class MeshImporter : public MeshImporterBase
@@ -131,6 +129,8 @@ public:
 
        MeshImporter(UnitConverter *unitconv, ArmatureImporter *arm, Scene *sce);
 
+       void bmeshConversion();
+
        virtual Object *get_object_by_geom_uid(const COLLADAFW::UniqueId& geom_uid);
        
        MTex *assign_textures_to_uvlayer(COLLADAFW::TextureCoordinateBinding &ctexture,
@@ -141,7 +141,7 @@ public:
                                                                        std::map<COLLADAFW::UniqueId, Material*>& uid_material_map,
                                                                        Object *ob, const COLLADAFW::UniqueId *geom_uid, 
                                                                        MTex **color_texture, char *layername, MTFace *texture_face,
-                                                                       std::map<Material*, TexIndexTextureArrayMap>& material_texture_mapping_map, int mat_index);
+                                                                       std::map<Material*, TexIndexTextureArrayMap>& material_texture_mapping_map, short mat_index);
        
        
        Object *create_mesh_object(COLLADAFW::Node *node, COLLADAFW::InstanceGeometry *geom,