diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:39:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:39:04 +0300 |
| commit | 95011f6d484b369db92ae13c674a6522d664ea8f (patch) | |
| tree | 91ba2719c9f3096fad0f1f768aa7b1c4d79aa32a /source/blender/editors/io | |
| parent | 0911acb5cf49c5ba05b1df045b41697704aa288a (diff) | |
| parent | 44505b38df557a5711703613685a1dec9fc2c3d9 (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 | ||||
| -rw-r--r-- | source/blender/editors/io/io_ops.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index 0f402083b6d..bb0280875bd 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -60,7 +60,7 @@ #include "io_collada.h" static int wm_collada_export_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) -{ +{ if (!RNA_struct_property_is_set(op->ptr, "filepath")) { char filepath[FILE_MAX]; @@ -586,8 +586,8 @@ void WM_OT_collada_import(wmOperatorType *ot) 0, INT_MAX); - RNA_def_boolean(ot->srna, - "keep_bind_info", 0, "Keep Bind Info", + RNA_def_boolean(ot->srna, + "keep_bind_info", 0, "Keep Bind Info", "Store Bindpose information in custom bone properties for later use during Collada export"); } diff --git a/source/blender/editors/io/io_ops.c b/source/blender/editors/io/io_ops.c index 6df4b0f4783..26414661f52 100644 --- a/source/blender/editors/io/io_ops.c +++ b/source/blender/editors/io/io_ops.c @@ -42,7 +42,7 @@ #include "io_cache.h" -void ED_operatortypes_io(void) +void ED_operatortypes_io(void) { #ifdef WITH_COLLADA /* Collada operators: */ |