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/blender/blenkernel | |
parent | 73633388ff2814300c007a6261f4e9fcbd1b5fc6 (diff) |
SCons: correct include for win, also minor cleanup
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/SConscript | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/fcurve.c | 4 |
2 files changed, 3 insertions, 2 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); |