modify error when python is not found so as not to confuse users who don't build...
authorCampbell Barton <ideasman42@gmail.com>
Wed, 30 Mar 2011 07:21:41 +0000 (07:21 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 30 Mar 2011 07:21:41 +0000 (07:21 +0000)
+ minor edits.

release/scripts/startup/bl_ui/space_view3d.py
source/blender/python/intern/bpy_interface.c
source/blender/windowmanager/intern/wm_event_system.c

index 06ad23302a88e5432664f8ecdf36142c8534fd9c..fc316779cfb158f9d5180d8211d1fd4a8ad6f39b 100644 (file)
@@ -258,7 +258,7 @@ class VIEW3D_MT_uv_map(bpy.types.Menu):
         layout.separator()
 
         layout.operator("uv.reset")
-        
+
 
 # ********** View menus **********
 
index f8214b643fe38aa9b704d86d14e0042cf53a11e7..80c4a6cf2f65fd5cb16f0da40ba1a0ac445c1a91 100644 (file)
@@ -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;
        }
index b52e8e92f2229c1b2baaf93112ad063f09c05d99..09ea924c0d28acf6b6d31c5a690b4d9565a77653 100644 (file)
@@ -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);