SCons: correct include for win, also minor cleanup
This commit is contained in:
parent
73633388ff
commit
7b0d6a1e6c
|
@ -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'):
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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) &&
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue