diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-09 20:19:30 +0400 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-09 20:19:30 +0400 |
commit | f34d1d55850cd82fbae843ffafa7115dab0e0eeb (patch) | |
tree | f01c7b58dc5a66639d4e554ba206e1752d4fada8 /source/blender/collada/collada.h | |
parent | 555bcc3298a564cb678c9f31ba6bded86d58bab6 (diff) |
[#33437](partial fix) Collada: importing a scene changes units. Added an option to disable unit settings during import.
Diffstat (limited to 'source/blender/collada/collada.h')
-rw-r--r-- | source/blender/collada/collada.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h index a02e3e007ae..587dc37b7db 100644 --- a/source/blender/collada/collada.h +++ b/source/blender/collada/collada.h @@ -46,7 +46,10 @@ struct Scene; /* * both return 1 on success, 0 on error */ -int collada_import(bContext *C, const char *filepath); +int collada_import(bContext *C, + const char *filepath, + int import_units); + int collada_export(Scene *sce, const char *filepath, int apply_modifiers, |