Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-03-30 11:21:41 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-03-30 11:21:41 +0400
commitbfadd7c9aa2ec2b5194baccc9fe49ee14a04f2a5 (patch)
tree83bc0afbb789553b2c9c125e0e18d45a3225428d /source/blender
parent206e5b717997cdb4c9451444e1badd573b862261 (diff)
modify error when python is not found so as not to confuse users who don't build blender.
+ minor edits.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/python/intern/bpy_interface.c2
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index f8214b643fe..80c4a6cf2f6 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -173,7 +173,7 @@ static void bpy_python_start_path(void)
if(py_path_bundle==NULL) {
/* Common enough to have bundled *nix python but complain on OSX/Win */
#if defined(__APPLE__) || defined(_WIN32)
- fprintf(stderr, "Bundled python is expected on this platform, if blender fails to load build the 'install' target\n");
+ fprintf(stderr, "Warning! bundled python not found and is expected on this platform. (if you built with CMake: 'install' target may have not been built)\n");
#endif
return;
}
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index b52e8e92f22..09ea924c0d2 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -1721,7 +1721,7 @@ void wm_event_do_handlers(bContext *C)
}
if(playing == 0) {
- int ncfra = sound_sync_scene(scene) * FPS + 0.5;
+ int ncfra = sound_sync_scene(scene) * (float)FPS + 0.5f;
if(ncfra != scene->r.cfra) {
scene->r.cfra = ncfra;
ED_update_for_newframe(CTX_data_main(C), scene, win->screen, 1);