From 4de70da73a1018469860a3b9595525f9eec7b025 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 6 Apr 2018 10:47:39 +0200 Subject: Cleanup: style, doxy headers --- source/blender/blenkernel/intern/armature_update.c | 2 +- source/blender/blenkernel/intern/undo_system.c | 4 ++-- source/blender/editors/io/io_collada.c | 5 ++--- source/blender/editors/lattice/lattice_intern.h | 2 +- source/blender/editors/lattice/lattice_ops.c | 2 +- source/blender/editors/render/render_internal.c | 2 +- source/blender/editors/undo/ed_undo.c | 2 +- source/blender/editors/undo/memfile_undo.c | 2 +- source/blender/editors/undo/undo_system_types.c | 2 +- source/blender/imbuf/IMB_metadata.h | 2 +- source/blender/imbuf/intern/writeimage.c | 8 ++++---- source/blender/makesrna/intern/rna_smoke.c | 2 +- source/blender/nodes/shader/nodes/node_shader_volume_principled.c | 2 +- source/blender/windowmanager/WM_undo.h | 0 14 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 source/blender/windowmanager/WM_undo.h (limited to 'source') diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c index 77f7819d2be..ee63e618b18 100644 --- a/source/blender/blenkernel/intern/armature_update.c +++ b/source/blender/blenkernel/intern/armature_update.c @@ -580,7 +580,7 @@ void BKE_pose_eval_init(EvaluationContext *UNUSED(eval_ctx), const int num_channels = BLI_listbase_count(&pose->chanbase); pose->chan_array = MEM_malloc_arrayN( - num_channels, sizeof(bPoseChannel*), "pose->chan_array"); + num_channels, sizeof(bPoseChannel *), "pose->chan_array"); /* clear flags */ int pchan_index = 0; diff --git a/source/blender/blenkernel/intern/undo_system.c b/source/blender/blenkernel/intern/undo_system.c index 09f4b2fdc01..760c6a60976 100644 --- a/source/blender/blenkernel/intern/undo_system.c +++ b/source/blender/blenkernel/intern/undo_system.c @@ -18,8 +18,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/editors/util/undo_system.c - * \ingroup edutil +/** \file blender/blenkernel/intern/undo_system.c + * \ingroup bke * * Used by ED_undo.h, internal implementation. */ diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index e6c9b924c7f..42c19c6bc65 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -145,7 +145,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"); @@ -496,8 +496,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)) { return OPERATOR_FINISHED; } else { 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 d81b85f1414..509fdcf080a 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -627,7 +627,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 c336069bff8..a0f7ebac477 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 */ diff --git a/source/blender/imbuf/IMB_metadata.h b/source/blender/imbuf/IMB_metadata.h index 0a0d2c1faf6..6a29fa01594 100644 --- a/source/blender/imbuf/IMB_metadata.h +++ b/source/blender/imbuf/IMB_metadata.h @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/imbuf/intern/IMB_metadata.h +/** \file blender/imbuf/IMB_metadata.h * \ingroup imbuf */ diff --git a/source/blender/imbuf/intern/writeimage.c b/source/blender/imbuf/intern/writeimage.c index c019b0b1363..e340d082895 100644 --- a/source/blender/imbuf/intern/writeimage.c +++ b/source/blender/imbuf/intern/writeimage.c @@ -81,7 +81,7 @@ short IMB_saveiff(struct ImBuf *ibuf, const char *name, int flags) bool IMB_prepare_write_ImBuf(const bool isfloat, ImBuf *ibuf) { - bool changed = false; + bool changed = false; if (isfloat) { /* pass */ @@ -90,9 +90,9 @@ bool IMB_prepare_write_ImBuf(const bool isfloat, ImBuf *ibuf) if (ibuf->rect == NULL && ibuf->rect_float) { ibuf->rect_colorspace = colormanage_colorspace_get_roled(COLOR_ROLE_DEFAULT_BYTE); IMB_rect_from_float(ibuf); - if (ibuf->rect != NULL) { - changed = true; - } + if (ibuf->rect != NULL) { + changed = true; + } } } diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c index 3bfe1fbcb83..38c297def32 100644 --- a/source/blender/makesrna/intern/rna_smoke.c +++ b/source/blender/makesrna/intern/rna_smoke.c @@ -905,7 +905,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) RNA_def_property_range(prop, 0.0, 1.0); RNA_def_property_ui_range(prop, 0.0, 1.0, 0.1, 3); RNA_def_property_ui_text(prop, "Clipping", - "Value under which voxels are considered empty space to optimize caching or rendering"); + "Value under which voxels are considered empty space to optimize caching or rendering"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, NULL); } diff --git a/source/blender/nodes/shader/nodes/node_shader_volume_principled.c b/source/blender/nodes/shader/nodes/node_shader_volume_principled.c index f9a481e6c7e..e85fec1ec9d 100644 --- a/source/blender/nodes/shader/nodes/node_shader_volume_principled.c +++ b/source/blender/nodes/shader/nodes/node_shader_volume_principled.c @@ -41,7 +41,7 @@ static bNodeSocketTemplate sh_node_volume_principled_in[] = { { SOCK_FLOAT, 1, N_("Blackbody Intensity"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR}, { SOCK_RGBA, 1, N_("Blackbody Tint"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f}, { SOCK_FLOAT, 1, N_("Temperature"), 1000.0f, 0.0f, 0.0f, 0.0f, 0.0f, 6500.0f}, - { SOCK_STRING, 1, N_("Temperature Attribute"),0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}, + { SOCK_STRING, 1, N_("Temperature Attribute"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}, { -1, 0, "" } }; diff --git a/source/blender/windowmanager/WM_undo.h b/source/blender/windowmanager/WM_undo.h deleted file mode 100644 index e69de29bb2d..00000000000 -- cgit v1.2.3