[Bf-blender-cvs] [7b0d6a1] master: SCons: correct include for win, also minor cleanup

[Campbell Barton]

Commit: 7b0d6a1e6c8233722731e77cd1b4641285c0c62d
Author: Campbell Barton
Date:   Mon Nov 24 09:33:12 2014 +0100
Branches: master
https://developer.blender.org/rB7b0d6a1e6c8233722731e77cd1b4641285c0c62d

SCons: correct include for win, also minor cleanup

===================================================================

M	source/blender/blenkernel/SConscript
M	source/blender/blenkernel/intern/fcurve.c
M	source/blender/blenlib/intern/hash_md5.c
M	source/blender/python/generic/idprop_py_api.c
M	source/blender/windowmanager/intern/wm_operators.c

===================================================================

diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 382c1fb..0484200 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 88d7069..d497a38 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 bc7a495..4eec382 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 at 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 b6790de..e77ff8f 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 7961619..f993f82 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)
 {