diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-07-30 01:51:53 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-07-30 01:51:53 +0400 |
| commit | 1a3a252e06811bdf625dbd0b7bed5de3b3e428a2 (patch) | |
| tree | 568a18edfb0187e42753e453f7b19fc4a1811f6c /source/blender/collada/collada_utils.h | |
| parent | c8958eea295a7dac07b02e50b81e377545cea7a0 (diff) | |
Collada: Import now always rotates input to match blender's Z_UP axis
Diffstat (limited to 'source/blender/collada/collada_utils.h')
| -rw-r--r-- | source/blender/collada/collada_utils.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h index f8e6f09e498..4bc2f55cf33 100644 --- a/source/blender/collada/collada_utils.h +++ b/source/blender/collada/collada_utils.h @@ -83,7 +83,8 @@ extern int bc_get_active_UVLayer(Object *ob); extern std::string bc_replace_string(std::string data, const std::string& pattern, const std::string& replacement); extern std::string bc_url_encode(std::string data); -extern void bc_match_scale(std::vector<Object *> *objects_done, Scene &sce, UnitConverter &unit_converter); +extern void bc_match_scale(Object *ob, UnitConverter &bc_unit, bool scale_to_scene); +extern void bc_match_scale(std::vector<Object *> *objects_done, UnitConverter &unit_converter, bool scale_to_scene); extern void bc_triangulate_mesh(Mesh *me); |