diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-11-24 11:33:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-24 11:56:24 +0300 |
| commit | 7b0d6a1e6c8233722731e77cd1b4641285c0c62d (patch) | |
| tree | 4847fb37312641c9ef1cec65b8c554de46889a77 /source | |
| parent | 73633388ff2814300c007a6261f4e9fcbd1b5fc6 (diff) | |
SCons: correct include for win, also minor cleanup
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/fcurve.c | 4 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/hash_md5.c | 2 | ||||
| -rw-r--r-- | source/blender/python/generic/idprop_py_api.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 382c1fb104e..0484200709f 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -168,6 +168,7 @@ if env['WITH_BF_FREESTYLE']: if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): incs += ' ' + env['BF_PTHREADS_INC'] + incs += ' ../../../intern/utfconv' if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index 88d70691120..d497a3853ea 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -2165,8 +2165,8 @@ static float fcurve_eval_keyframes(FCurve *fcu, BezTriple *bezts, float evaltime * the value is simply the shared value (see T40372 -> F91346) */ cvalue = v1[1]; - } - else { + } + else { /* adjust handles so that they don't overlap (forming a loop) */ correct_bezpart(v1, v2, v3, v4); diff --git a/source/blender/blenlib/intern/hash_md5.c b/source/blender/blenlib/intern/hash_md5.c index bc7a495f213..4eec38278e9 100644 --- a/source/blender/blenlib/intern/hash_md5.c +++ b/source/blender/blenlib/intern/hash_md5.c @@ -22,7 +22,7 @@ * Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>. */ -/** \file blender/blenlib/intern/md5.c +/** \file blender/blenlib/intern/hash_md5.c * \ingroup bli * * Functions to compute MD5 message digest of files or memory blocks diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c index b6790de8ddf..e77ff8fd2f4 100644 --- a/source/blender/python/generic/idprop_py_api.c +++ b/source/blender/python/generic/idprop_py_api.c @@ -512,7 +512,7 @@ bool BPy_IDProperty_Map_ValidateAndCreate(PyObject *name_obj, IDProperty *group, else { IDProperty *prop_exist; - /* avoid freeing when types match incase they are referenced by the UI, see: T37073 + /* avoid freeing when types match in case they are referenced by the UI, see: T37073 * obviously this isn't a complete solution, but helps for common cases. */ prop_exist = IDP_GetPropertyFromGroup(group, prop->name); if ((prop_exist != NULL) && diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 79616197dff..f993f821e78 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1402,7 +1402,7 @@ wmOperator *WM_operator_last_redo(const bContext *C) } /** - * Use for drag & drop a path or name with opeators invoke() function. + * Use for drag & drop a path or name with operators invoke() function. */ ID *WM_operator_drop_load_path(struct bContext *C, wmOperator *op, const short idcode) { |