Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

modify error when python is not found so as not to confuse users who don't build blender.

Browse Source 
+ minor edits.
This commit is contained in:
Campbell Barton
2011-03-30 07:21:41 +00:00
parent 206e5b7179
commit bfadd7c9aa
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/space_view3d.py
View File

@@ -258,7 +258,7 @@ class VIEW3D_MT_uv_map(bpy.types.Menu):
layout.separator() layout.separator()
layout.operator("uv.reset") layout.operator("uv.reset")
# ********** View menus ********** # ********** View menus **********

2
source/blender/python/intern/bpy_interface.c
View File

@@ -173,7 +173,7 @@ static void bpy_python_start_path(void)
if(py_path_bundle==NULL) { if(py_path_bundle==NULL) {
/* Common enough to have bundled *nix python but complain on OSX/Win */ /* Common enough to have bundled *nix python but complain on OSX/Win */
#if defined(__APPLE__) || defined(_WIN32) #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 #endif
return; return;
} }

2
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -1721,7 +1721,7 @@ void wm_event_do_handlers(bContext *C)
} }
if(playing == 0) { 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) { if(ncfra != scene->r.cfra) {
scene->r.cfra = ncfra; scene->r.cfra = ncfra;
ED_update_for_newframe(CTX_data_main(C), scene, win->screen, 1); ED_update_for_newframe(CTX_data_main(C), scene, win->screen, 1);