diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-08 15:07:34 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-08 15:07:34 +0300 |
| commit | a981206fd183355bdcc8331b3a74ce3d382e1f67 (patch) | |
| tree | efa5534ed691645530707a80cf4a2039909f79b7 /source/blender/editors/io/io_collada.c | |
| parent | 0b5ebb3265b155658d441135e152f32ba11c001d (diff) | |
| parent | 245e01c30ac296c509e04f702c6b5d76086265b5 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/io/io_collada.c')
| -rw-r--r-- | source/blender/editors/io/io_collada.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index a42aeee912b..4d0d59ae42c 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -151,7 +151,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op) include_animations = RNA_boolean_get(op->ptr, "include_animations"); sample_animations = RNA_boolean_get(op->ptr, "sample_animations"); - sampling_rate = (sample_animations)? RNA_int_get(op->ptr, "sampling_rate") : 0; + sampling_rate = (sample_animations) ? RNA_int_get(op->ptr, "sampling_rate") : 0; deform_bones_only = RNA_boolean_get(op->ptr, "deform_bones_only"); @@ -490,8 +490,7 @@ static int wm_collada_import_exec(bContext *C, wmOperator *op) import_settings.min_chain_length = min_chain_length; import_settings.keep_bind_info = keep_bind_info != 0; - if (collada_import(C, &import_settings) ) - { + if (collada_import(C, &import_settings)) { DEG_id_tag_update(&CTX_data_scene(C)->id, DEG_TAG_BASE_FLAGS_UPDATE); return OPERATOR_FINISHED; } |