Merge branch 'blender2.7'
[blender.git] / source / blender / collada / GeometryExporter.h
index 05cc23e2057d2b54b7cc53e74b31c885783113fe..5eba68165d213399a229133877332c522ae8cebc 100644 (file)
@@ -85,7 +85,7 @@ public:
                                                     std::string& geom_id);
 
        // powerful because it handles both cases when there is material and when there's not
-       void createPolylist(short material_index,
+       void create_mesh_primitive_list(short material_index,
                                                bool has_uvs,
                                                bool has_color,
                                                Object *ob,