[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35895] trunk/blender: modify error when python is not found so as not to confuse users who don' t build blender.
Campbell Barton
ideasman42 at gmail.com
Wed Mar 30 09:21:42 CEST 2011
Revision: 35895
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35895
Author: campbellbarton
Date: 2011-03-30 07:21:41 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
modify error when python is not found so as not to confuse users who don't build blender.
+ minor edits.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-03-30 06:27:39 UTC (rev 35894)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-03-30 07:21:41 UTC (rev 35895)
@@ -258,8 +258,8 @@
layout.separator()
layout.operator("uv.reset")
-
+
# ********** View menus **********
Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c 2011-03-30 06:27:39 UTC (rev 35894)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c 2011-03-30 07:21:41 UTC (rev 35895)
@@ -173,7 +173,7 @@
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;
}
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2011-03-30 06:27:39 UTC (rev 35894)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2011-03-30 07:21:41 UTC (rev 35895)
@@ -1721,7 +1721,7 @@
}
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);
More information about the Bf-blender-cvs
mailing list