Commit: 7fbc7b83c936e77a1d1a97bcbb591a31cda3341f
Author: Ines Almeida
Date: Mon Jan 12 10:48:14 2015 +0100
Branches: soc-2014-bge
https://developer.blender.org/rB7fbc7b83c936e77a1d1a97bcbb591a31cda3341f
Merge branch 'master' into soc-2014-bge
Conflicts:
source/blender/blenkernel/intern/object.c
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/object.c
index e0fee2f,a9292ac..b158f7b
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -2387,13 -2403,22 +2403,14 @@@ static void solve_parenting(Scene *scen
static bool where_is_object_parslow(Object *ob, float obmat[4][4], float
slowmat[4][4])
{
- float *fp1, *fp2;
- float fac1, fac2;
- int a;
+ float fac1 = (1.0f / (1.0f + fabsf(ob->sf)) );
- if (fac1 >= 1.0f) return 0;
- /* include framerate */
- fac1 = (1.0f / (1.0f + fabsf(ob->sf)));
- if (fac1 >= 1.0f) return false;
- fac2 = 1.0f - fac1;
++ if (fac1 >= 1.0f)
++ return false;
- fp1 = obmat[0];
- fp2 = slowmat[0];
- for (a = 0; a < 16; a++, fp1++, fp2++) {
- fp1[0] = fac1 * fp1[0] + fac2 * fp2[0];
- }
+ blend_m4_m4m4(obmat, slowmat, obmat, fac1);
- return 1;
+ return true;
}
/* note, scene is the active scene while actual_scene is the scene the object
resides in */
diff --cc source/gameengine/Ketsji/KX_PythonInit.cpp
index d7edf66,3ddd53b..e6de9a3
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@@ -2075,22 -2075,16 +2079,22 @@@ PyObject *initGamePlayerPythonScripting
* somehow it remembers the sys.path - Campbell
*/
static bool first_time = true;
- const char * const py_path_bundle =
BLI_get_folder(BLENDER_SYSTEM_PYTHON, NULL);
+ const char * const py_path_bundle =
BKE_appdir_folder_id(BLENDER_SYSTEM_PYTHON, NULL);
-#if 0 // TODO - py3
- STR_String pname = progname;
- Py_SetProgramName(pname.Ptr());
-#endif
+ /* not essential but nice to set our name */
+ static wchar_t program_path_wchar[FILE_MAX]; /* python holds a
reference */
+ BLI_strncpy_wchar_from_utf8(program_path_wchar, BLI_program_path(),
sizeof(program_path_wchar) / sizeof(wchar_t));
+ Py_SetProgramName(program_path_wchar);
+ /* Update, Py3.3 resolves attempting to parse non-existing header */
+ #if 0
+ /* Python 3.2 now looks for '2.xx/python/include/python3.2d/pyconfig.h'
to
+ * parse from the 'sysconfig' module which is used by 'site',
+ * so for now disable site. alternatively we could copy the file. */
if (py_path_bundle != NULL) {
- Py_NoSiteFlag = 1;
+ Py_NoSiteFlag = 1; /* inhibits the automatic importing of
'site' */
}
+ #endif
Py_FrozenFlag = 1;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
