diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:01:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:01:53 +0300 |
| commit | 059c119719e04283808d3c7076886e1a58874f6b (patch) | |
| tree | 5296776b81111ef62e33687d4a9b4c6ab5e297ff /source/blender/editors/io | |
| parent | fa0fcbe4d6ca3f183f02395fe9ba18fb5ea87748 (diff) | |
| parent | e742e0934de6384eeaf271ca4cfe99922ddbe3fb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/io')
| -rw-r--r-- | source/blender/editors/io/io_collada.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index abe7ba06cfe..2ddf5e2584e 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -257,7 +257,7 @@ static void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr) uiLayout *box, *row, *col, *split; bool include_animations = RNA_boolean_get(imfptr, "include_animations"); int ui_section = RNA_enum_get(imfptr, "prop_bc_export_ui_section"); - + BC_export_animation_type animation_type = RNA_enum_get(imfptr, "export_animation_type_selection"); BC_export_transformation_type transformation_type = RNA_enum_get(imfptr, "export_transformation_type_selection"); @@ -265,7 +265,7 @@ static void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr) /* Export Options: */ box = uiLayoutBox(layout); - + row = uiLayoutRow(box, false); uiItemR(row, imfptr, "prop_bc_export_ui_section", UI_ITEM_R_EXPAND, NULL, ICON_NONE); @@ -348,7 +348,7 @@ static void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr) row = uiLayoutColumn(box, false); uiItemR(row, imfptr, "keep_smooth_curves", 0, NULL, ICON_NONE); - uiLayoutSetEnabled(row, include_animations && + uiLayoutSetEnabled(row, include_animations && (transformation_type == BC_TRANSFORMATION_TYPE_TRANSROTLOC || animation_type == BC_ANIMATION_EXPORT_KEYS)); row = uiLayoutColumn(box, false); |