archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

[#33437](partial fix) Collada: importing a scene changes units. Added an option to disable unit settings during import.

Browse Source
This commit is contained in:
Gaia Clary
2013-02-09 16:19:30 +00:00
parent 555bcc3298
commit f34d1d5585
8 changed files with 158 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/collada/collada.cpp
View File

@@ -31,6 +31,7 @@
#include "DocumentExporter.h"
#include "DocumentImporter.h"
#include "ExportSettings.h"
#include "ImportSettings.h"
extern "C"
{
@@ -42,9 +43,17 @@ extern "C"
#include "BLI_path_util.h"
#include "BLI_linklist.h"
int collada_import(bContext *C, const char *filepath)
int collada_import(bContext *C,
const char *filepath,
int import_units)
{
DocumentImporter imp(C, filepath);
ImportSettings import_settings;
import_settings.filepath = (char *)filepath;
import_settings.import_units = import_units != 0;
DocumentImporter imp(C, &import_settings);
if (imp.import()) return 1;
return 0;