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 | |
parent | 0b5ebb3265b155658d441135e152f32ba11c001d (diff) | |
parent | 245e01c30ac296c509e04f702c6b5d76086265b5 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/io/io_collada.c | 5 | ||||
-rw-r--r-- | source/blender/editors/lattice/lattice_intern.h | 2 | ||||
-rw-r--r-- | source/blender/editors/lattice/lattice_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/render/render_internal.c | 2 | ||||
-rw-r--r-- | source/blender/editors/undo/ed_undo.c | 2 | ||||
-rw-r--r-- | source/blender/editors/undo/memfile_undo.c | 2 | ||||
-rw-r--r-- | source/blender/editors/undo/undo_system_types.c | 2 |
7 files changed, 8 insertions, 9 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; } diff --git a/source/blender/editors/lattice/lattice_intern.h b/source/blender/editors/lattice/lattice_intern.h index 94f528a0457..7902b992270 100644 --- a/source/blender/editors/lattice/lattice_intern.h +++ b/source/blender/editors/lattice/lattice_intern.h @@ -21,7 +21,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/editors/metaball/lattice_intern.h +/** \file blender/editors/lattice/lattice_intern.h * \ingroup edlattice */ diff --git a/source/blender/editors/lattice/lattice_ops.c b/source/blender/editors/lattice/lattice_ops.c index 37a10cbe12a..d3d57a0b510 100644 --- a/source/blender/editors/lattice/lattice_ops.c +++ b/source/blender/editors/lattice/lattice_ops.c @@ -24,7 +24,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/editors/metaball/lattice_ops.c +/** \file blender/editors/lattice/lattice_ops.c * \ingroup edlattice */ diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index e1e5c788b02..f8b1861b204 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -643,7 +643,7 @@ static void render_image_restore_layer(RenderJob *rj) /* For single layer renders keep the active layer * visible, or show the compositing result. */ RenderResult *rr = RE_AcquireResultRead(rj->re); - if(RE_HasCombinedLayer(rr)) { + if (RE_HasCombinedLayer(rr)) { sima->iuser.layer = 0; } RE_ReleaseResult(rj->re); diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c index 09abc1f3878..d8b194e3336 100644 --- a/source/blender/editors/undo/ed_undo.c +++ b/source/blender/editors/undo/ed_undo.c @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/editors/util/undo.c +/** \file blender/editors/undo/ed_undo.c * \ingroup edundo */ diff --git a/source/blender/editors/undo/memfile_undo.c b/source/blender/editors/undo/memfile_undo.c index b588aa8fb13..f4ed96f98f3 100644 --- a/source/blender/editors/undo/memfile_undo.c +++ b/source/blender/editors/undo/memfile_undo.c @@ -18,7 +18,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/editors/util/memfile_undo.c +/** \file blender/editors/undo/memfile_undo.c * \ingroup edundo * * Wrapper between 'ED_undo.h' and 'BKE_undo_system.h' API's. diff --git a/source/blender/editors/undo/undo_system_types.c b/source/blender/editors/undo/undo_system_types.c index 4dbd22d6d22..75c3d2cc1b7 100644 --- a/source/blender/editors/undo/undo_system_types.c +++ b/source/blender/editors/undo/undo_system_types.c @@ -18,7 +18,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/editors/util/undo_system_types.c +/** \file blender/editors/undo/undo_system_types.c * \ingroup edundo */ |