diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-01-14 15:53:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-14 15:53:39 +0300 |
| commit | ca0605b3ae7b41f32fdd4966e58ff2968ce50efe (patch) | |
| tree | 56f06a5a003dda0540970452e54e4e4b7ae387f6 /source/blender | |
| parent | edad3f93f6da549456ffe8711336d34c7819dbe7 (diff) | |
cleanup: minor edits
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/BKE_data_transfer.h | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_data_transfer.h b/source/blender/blenkernel/BKE_data_transfer.h index 07ef16e8161..d31804b3cae 100644 --- a/source/blender/blenkernel/BKE_data_transfer.h +++ b/source/blender/blenkernel/BKE_data_transfer.h @@ -29,8 +29,8 @@ * \ingroup bke */ -#ifndef __BKE_OBJECT_DATA_TRANSFER_H__ -#define __BKE_OBJECT_DATA_TRANSFER_H__ +#ifndef __BKE_DATA_TRANSFER_H__ +#define __BKE_DATA_TRANSFER_H__ #ifdef __cplusplus extern "C" { @@ -155,4 +155,4 @@ bool BKE_object_data_transfer_dm( } #endif -#endif /* __BKE_OBJECT_DATA_TRANSFER_H__ */ +#endif /* __BKE_DATA_TRANSFER_H__ */ diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 8f74df72b04..ccbce205b01 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -3521,7 +3521,7 @@ int BKE_object_is_modified(Scene *scene, Object *ob) * objects moves (causing deformation motion blur) or not. * * This makes it possible to give some degree of false-positives here, - * but it's currently an acceptable tradeof between complexity and check + * but it's currently an acceptable tradeoff between complexity and check * speed. In combination with checks of modifier stack and real life usage * percentage of false-positives shouldn't be that hight. */ diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 02a029fc3f3..d49a298c424 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -4766,7 +4766,7 @@ static int previews_ensure_exec(bContext *C, wmOperator *UNUSED(op)) /* This will loop over all IDs linked by current one, render icons for them if needed, * and add them to 'todo' preview_id_stack. */ BKE_library_foreach_ID_link(id, previews_id_ensure_callback, &preview_id_stack, IDWALK_READONLY); - } while((id = BLI_LINKSTACK_POP(preview_id_stack.id_stack))); + } while ((id = BLI_LINKSTACK_POP(preview_id_stack.id_stack))); } BLI_LINKSTACK_FREE(preview_id_stack.id_stack); |