diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-11 02:14:56 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-11 02:14:56 +0400 |
| commit | 22dbb675c156a24880e3b1803a0f5abde53af4b8 (patch) | |
| tree | 9c36399f029fc48a4e05be92e5db4075e375c600 /source/blender/editors/io | |
| parent | 1ba194aeddef7a4d2859d7587b60c70c03387b1c (diff) | |
Fix #33437 Collada: Added scale matching for Scene imports.
Diffstat (limited to 'source/blender/editors/io')
| -rw-r--r-- | source/blender/editors/io/io_collada.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index d8bb372b936..52a585dd314 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -319,12 +319,11 @@ static int wm_collada_import_exec(bContext *C, wmOperator *op) import_units = RNA_boolean_get(op->ptr, "import_units"); RNA_string_get(op->ptr, "filepath", filename); - if (collada_import(C, filename, import_units)) { + if (collada_import( C, filename, import_units)) { return OPERATOR_FINISHED; } else { - BKE_report(op->reports, RPT_ERROR, - "Errors found during parsing COLLADA document (see console for details)"); + BKE_report(op->reports, RPT_ERROR, "Errors found during parsing COLLADA document (see console for details)"); return OPERATOR_CANCELLED; } } @@ -367,8 +366,9 @@ void WM_OT_collada_import(wmOperatorType *ot) WM_operator_properties_filesel(ot, FOLDERFILE | COLLADAFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); - RNA_def_boolean(ot->srna, "import_units", 0, "Import Units", - "If enabled use Units as defined in Collada Import, else keep Blender's current Units settings"); + RNA_def_boolean(ot->srna, + "import_units", 0, "Import Units", + "If disabled match import to Blender's current Unit settings. Otherwise use the settings from the Imported scene."); } #endif |