[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21939] branches/soc-2009-yukishiro: merge till 21938
Jingyuan Huang
jingyuan.huang at gmail.com
Mon Jul 27 20:11:52 CEST 2009
Revision: 21939
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21939
Author: yukishiro
Date: 2009-07-27 20:11:49 +0200 (Mon, 27 Jul 2009)
Log Message:
-----------
merge till 21938
Modified Paths:
--------------
branches/soc-2009-yukishiro/blenderplayer/CMakeLists.txt
branches/soc-2009-yukishiro/config/win32-mingw-config.py
branches/soc-2009-yukishiro/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/soc-2009-yukishiro/release/datafiles/splash.jpg
branches/soc-2009-yukishiro/release/scripts/bpymodules/colladaImEx/translator.py
branches/soc-2009-yukishiro/release/scripts/bvh_import.py
branches/soc-2009-yukishiro/release/scripts/collada_export.py
branches/soc-2009-yukishiro/release/scripts/export_dxf.py
branches/soc-2009-yukishiro/release/scripts/export_fbx.py
branches/soc-2009-yukishiro/release/scripts/export_map.py
branches/soc-2009-yukishiro/release/scripts/export_obj.py
branches/soc-2009-yukishiro/release/scripts/import_dxf.py
branches/soc-2009-yukishiro/release/scripts/import_obj.py
branches/soc-2009-yukishiro/release/scripts/object_active_to_other.py
branches/soc-2009-yukishiro/release/scripts/vertexpaint_selfshadow_ao.py
branches/soc-2009-yukishiro/release/ui/bpy_ops.py
branches/soc-2009-yukishiro/release/ui/buttons_data_armature.py
branches/soc-2009-yukishiro/release/ui/buttons_data_bone.py
branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py
branches/soc-2009-yukishiro/release/ui/buttons_data_curve.py
branches/soc-2009-yukishiro/release/ui/buttons_data_empty.py
branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py
branches/soc-2009-yukishiro/release/ui/buttons_data_lattice.py
branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py
branches/soc-2009-yukishiro/release/ui/buttons_data_modifier.py
branches/soc-2009-yukishiro/release/ui/buttons_data_text.py
branches/soc-2009-yukishiro/release/ui/buttons_game.py
branches/soc-2009-yukishiro/release/ui/buttons_material.py
branches/soc-2009-yukishiro/release/ui/buttons_object_constraint.py
branches/soc-2009-yukishiro/release/ui/buttons_particle.py
branches/soc-2009-yukishiro/release/ui/buttons_physics_cloth.py
branches/soc-2009-yukishiro/release/ui/buttons_physics_field.py
branches/soc-2009-yukishiro/release/ui/buttons_physics_fluid.py
branches/soc-2009-yukishiro/release/ui/buttons_physics_softbody.py
branches/soc-2009-yukishiro/release/ui/buttons_texture.py
branches/soc-2009-yukishiro/release/ui/buttons_world.py
branches/soc-2009-yukishiro/release/ui/space_buttons.py
branches/soc-2009-yukishiro/release/ui/space_console.py
branches/soc-2009-yukishiro/release/ui/space_filebrowser.py
branches/soc-2009-yukishiro/release/ui/space_image.py
branches/soc-2009-yukishiro/release/ui/space_info.py
branches/soc-2009-yukishiro/release/ui/space_outliner.py
branches/soc-2009-yukishiro/release/ui/space_sequencer.py
branches/soc-2009-yukishiro/release/ui/space_text.py
branches/soc-2009-yukishiro/release/ui/space_view3d.py
branches/soc-2009-yukishiro/release/ui/space_view3d_toolbar.py
branches/soc-2009-yukishiro/release/windows/extra/python26.zip
branches/soc-2009-yukishiro/source/blender/avi/intern/avi.c
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_nla.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_softbody.h
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/boids.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/image.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/mesh.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/nla.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/particle.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/particle_system.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/screen.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/softbody.c
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_arithb.h
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_kdtree.h
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_storage_types.h
branches/soc-2009-yukishiro/source/blender/blenlib/intern/arithb.c
branches/soc-2009-yukishiro/source/blender/blenlib/intern/fileops.c
branches/soc-2009-yukishiro/source/blender/blenlib/intern/storage.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_channels.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_filter.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_markers.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_ops.c
branches/soc-2009-yukishiro/source/blender/editors/animation/keyframing.c
branches/soc-2009-yukishiro/source/blender/editors/armature/armature_intern.h
branches/soc-2009-yukishiro/source/blender/editors/armature/armature_ops.c
branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature.c
branches/soc-2009-yukishiro/source/blender/editors/armature/poseobject.c
branches/soc-2009-yukishiro/source/blender/editors/include/ED_anim_api.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_armature.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_fileselect.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_keyframing.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_object.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_screen.h
branches/soc-2009-yukishiro/source/blender/editors/include/UI_interface.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_intern.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-yukishiro/source/blender/editors/interface/view2d_ops.c
branches/soc-2009-yukishiro/source/blender/editors/object/editconstraint.c
branches/soc-2009-yukishiro/source/blender/editors/object/object_edit.c
branches/soc-2009-yukishiro/source/blender/editors/object/object_intern.h
branches/soc-2009-yukishiro/source/blender/editors/object/object_ops.c
branches/soc-2009-yukishiro/source/blender/editors/physics/editparticle.c
branches/soc-2009-yukishiro/source/blender/editors/screen/screen_context.c
branches/soc-2009-yukishiro/source/blender/editors/screen/screen_edit.c
branches/soc-2009-yukishiro/source/blender/editors/screen/screen_intern.h
branches/soc-2009-yukishiro/source/blender/editors/screen/screen_ops.c
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_console/console_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_console/console_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_console/space_console.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/filelist.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/filelist.h
branches/soc-2009-yukishiro/source/blender/editors/space_file/filesel.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/space_file.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_image/image_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/nla_channels.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/nla_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/nla_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/nla_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner.c
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2009-yukishiro/source/blender/editors/space_time/space_time.c
branches/soc-2009-yukishiro/source/blender/editors/space_time/time_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_conversions.c
branches/soc-2009-yukishiro/source/blender/imbuf/intern/iris.c
branches/soc-2009-yukishiro/source/blender/imbuf/intern/util.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_action_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_brush_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_material_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_object_force.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_object_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_particle_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scene_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_screen_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_space_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_access.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ID.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_access.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_armature.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_brush.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_internal.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_material.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_rna.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ui.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_wm.c
branches/soc-2009-yukishiro/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c
branches/soc-2009-yukishiro/source/blender/python/epy_doc_gen.py
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_interface.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_operator.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/convertblender.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/rayshade.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/shadbuf.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/shadeinput.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/shadeoutput.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/texture.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/zbuf.c
branches/soc-2009-yukishiro/source/blender/windowmanager/WM_api.h
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_files.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_window.c
branches/soc-2009-yukishiro/source/blender/windowmanager/wm.h
branches/soc-2009-yukishiro/source/blender/windowmanager/wm_event_types.h
branches/soc-2009-yukishiro/source/blender/windowmanager/wm_window.h
branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2009-yukishiro/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2009-yukishiro/source/gameengine/Converter/BL_MeshDeformer.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_MeshProxy.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2009-yukishiro/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2009-yukishiro/source/gameengine/PyDoc/API_intro.py
branches/soc-2009-yukishiro/source/gameengine/PyDoc/GameTypes.py
branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_Deformer.h
branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_MeshObject.h
Added Paths:
-----------
branches/soc-2009-yukishiro/release/ui/buttons_object.py
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_sculpt_paint.c
Removed Paths:
-------------
branches/soc-2009-yukishiro/ChangeLog
branches/soc-2009-yukishiro/release/ui/buttons_objects.py
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_vpaint.c
Deleted: branches/soc-2009-yukishiro/ChangeLog
===================================================================
--- branches/soc-2009-yukishiro/ChangeLog 2009-07-27 17:43:13 UTC (rev 21938)
+++ branches/soc-2009-yukishiro/ChangeLog 2009-07-27 18:11:49 UTC (rev 21939)
@@ -1,114 +0,0 @@
-
-Fri Feb 21 10:37:54 CST 2003 mein at cs.umn.edu
- Added Goofsters alt-m menu for merging verts in edit mode.
-
-Fri Feb 21 10:37:54 CST 2003 mein at cs.umn.edu
- Added MacOSX plugin stuff
-
-Thu Apr 24 00:48:43 CST 2003 cwant at ualberta.ca
- Added auto-skinning support. When parenting a mesh to an
- armature the user is confronted with a menu about creating
- weight groups. They can either create empty groups,
- create groups that are populated based on a closest bone
- algorithm, or create no groups.
-
-Mon Apr 28 04:04:44 CET 2003 phaseIV at zonnet.nl
- Added Quicktime image and movie import for textures.
- Added Quicktime movie export for rendering.
- Note: the selected export codec isn't saved in the blendfile.
- Enable with the WITH_QUICKTIME compile flag.
-
-Mon Apr 28 12:32:12 CET 2003 phaseIV at zonnet.nl
- Added (Win32) text clipboard support and a rightmouse menu to
- the text editor. Added the possibility to export text from
- the editor to a 3D Font object with alt-m. (up to 1000 chars)
- Added rename/delete popups to the file and imageselectors.
- Redesigned the userpreference window layout. (unfinished atm.)
-
-Mon Apr 28 23:17:04 CET 2003 phaseIV at zonnet.nl
- Added a 3D font loader that uses the Freetype2 library to
- parse the vector data. Freetype2 supports many font formats
- including Type1, TrueType and OpenType fonts.
- Enable with the WITH_FREETYPE2 compile flag.
-
-Initial Change Log for Blender 2.26 Sun Feb 9 10:53:10 UTC 2003
-
-New features of Blender 2.26:
------------------------------
-
-- Mousewheel support for all windows. Two user settings are added in the
- top window for mousewheel usage. The zoom direction [WZoom] and the
- number of lines that get scrolled [WLines] can be set here.
- The mousewheel also works to increase/decrease the size of the circle
- while selecting or doing proportional scaling.
-
-- A "fake user" button next to the material popup has been added, to keep
- the data when it has been unlinked from an object. (Basically a shortcut
- for pressing Shift+F4 and F)
-
-- Added support for manipulating Ipo bezier handles through the action
- window. Selecting action keys and pressing VKEY, HKEY, or shift-HKEY
- modifies the handles of the keys in the same way it does in the IPO
- window.
-
-- CKEY in the action window scrolls the window so that the current frame
- is in the center.
-
-- Extra selection support for the action window, including:
- - border select initiated in the channel names border selects the
- channels and constraint channels.
- - right click or border select initiated in the horizontal scroll
- causes blender to select all keys for the selected frames.
- - right click or border select in the vertical scroll causes blender
- to select all keys for the channel or constraint channels that are
- to the left of the selection.
-
-- X-ray bones support for showing armature bones in shaded mode (disabled
- depth test). The new x-ray button is added in the edit buttons when the
- armature is selected.
-
-- TKEY in the action window changes the Ipo type (constant/linear/bezier)
- for the Ipo curves owned by the selected channels
-
-- Simple shaded+wire and solid+wire drawmodes. It basically draws the
- wireframe after drawing the model in solid/shaded/textured mode.
- The user can set this per object using the "Wire" button in the edit
- buttons window.
-
-- A headerbutton for drawing linenumbers in the texteditor.
-
-- Ctrl keystrokes for cut/copy/paste/undo/redo in the texteditor.
-
-- NTSC render preset (Image size - 720x480, Aspect ratio - 10x11, 30 fps)
-
-
-Bugfixes:
----------
-
-- Make switching to bottom, back, and left view (shift+pad7, shift+pad1
- and shift+pad1) work when in camera view.
-
-- Full screen by default under Unix.
-
-- Ignore WM_DELETE_WINDOW on IRIX.
-
-- Icons in the imageselect window get drawn properly.
-
-
-Workarounds:
-------------
-
-- A small modification is made that prevents closing the renderwindow on
- Mac OSX, so the GUI won't becoming irresponsive.
-
-
-Still Not working:
------------------
-
-Plugins in MacOSX
-
-Older Python API
-
-New build system using configure (this is partially working but
- needs some work)
-
Modified: branches/soc-2009-yukishiro/blenderplayer/CMakeLists.txt
===================================================================
--- branches/soc-2009-yukishiro/blenderplayer/CMakeLists.txt 2009-07-27 17:43:13 UTC (rev 21938)
+++ branches/soc-2009-yukishiro/blenderplayer/CMakeLists.txt 2009-07-27 18:11:49 UTC (rev 21939)
@@ -69,7 +69,6 @@
bf_blenkernel
verse
bf_blenkernel
- bf_decimation
bf_blenloader
bf_blenpluginapi
bf_blroutines
Modified: branches/soc-2009-yukishiro/config/win32-mingw-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/win32-mingw-config.py 2009-07-27 17:43:13 UTC (rev 21938)
+++ branches/soc-2009-yukishiro/config/win32-mingw-config.py 2009-07-27 18:11:49 UTC (rev 21939)
@@ -4,6 +4,7 @@
BF_PYTHON = LIBDIR + '/python'
BF_PYTHON_VERSION = '3.1'
#BF_PYTHON_VERSION = '2.6'
+#BF_PYTHON_VERSION = '2.6'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
Modified: branches/soc-2009-yukishiro/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/soc-2009-yukishiro/intern/ghost/intern/GHOST_WindowWin32.cpp 2009-07-27 17:43:13 UTC (rev 21938)
+++ branches/soc-2009-yukishiro/intern/ghost/intern/GHOST_WindowWin32.cpp 2009-07-27 18:11:49 UTC (rev 21939)
@@ -117,18 +117,34 @@
m_maxPressure(0)
{
if (state != GHOST_kWindowStateFullScreen) {
+ RECT rect;
+ GHOST_TUns32 tw, th;
+
+ width += GetSystemMetrics(SM_CXSIZEFRAME)*2;
+ height += GetSystemMetrics(SM_CYSIZEFRAME)*2 + GetSystemMetrics(SM_CYCAPTION);
+
// take taskbar into account
- RECT rect;
SystemParametersInfo(SPI_GETWORKAREA,0,&rect,0);
- height = rect.bottom - rect.top;
- width = rect.right - rect.left;
+ th = rect.bottom - rect.top;
+ tw = rect.right - rect.left;
+ if(tw < width)
+ {
+ width = tw;
+ left = rect.left;
+ }
+ if(th < height)
+ {
+ height = th;
+ top = rect.top;
+ }
+
m_hWnd = ::CreateWindow(
s_windowClassName, // pointer to registered class name
title, // pointer to window name
WS_OVERLAPPEDWINDOW, // window style
- rect.left, // horizontal position of window
- rect.top, // vertical position of window
+ left, // horizontal position of window
+ top, // vertical position of window
width, // window width
height, // window height
0, // handle to parent or owner window
Modified: branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
===================================================================
--- branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj 2009-07-27 17:43:13 UTC (rev 21938)
+++ branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj 2009-07-27 18:11:49 UTC (rev 21939)
@@ -767,6 +767,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_sculpt_paint.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_sensor.c"
>
</File>
@@ -811,10 +815,6 @@
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna_vpaint.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_wm.c"
>
</File>
Modified: branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
===================================================================
--- branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj 2009-07-27 17:43:13 UTC (rev 21938)
+++ branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj 2009-07-27 18:11:49 UTC (rev 21939)
@@ -323,6 +323,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_sculpt_paint_gen.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_sensor_gen.c"
>
</File>
@@ -363,10 +367,6 @@
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna_vpaint_gen.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_wm_gen.c"
>
</File>
Modified: branches/soc-2009-yukishiro/release/datafiles/splash.jpg
===================================================================
(Binary files differ)
Modified: branches/soc-2009-yukishiro/release/scripts/bpymodules/colladaImEx/translator.py
===================================================================
--- branches/soc-2009-yukishiro/release/scripts/bpymodules/colladaImEx/translator.py 2009-07-27 17:43:13 UTC (rev 21938)
+++ branches/soc-2009-yukishiro/release/scripts/bpymodules/colladaImEx/translator.py 2009-07-27 18:11:49 UTC (rev 21939)
@@ -3065,7 +3065,7 @@
for k, daePolygons in daePolygonsDict.iteritems():
if k != -1:
if not useUV and not mesh.materials is None and len(mesh.materials) > 0 and k >= 0:
- daePolygons.material = mesh.materials[k].name
+ daePolygons.material = getattr(mesh.materials[k], 'name', "")
elif mesh.faceUV and (useUV or mesh.materials is None or len(mesh.materials) == 0):
daePolygons.material = uvTextures[k]
offsetCount = 0
Modified: branches/soc-2009-yukishiro/release/scripts/bvh_import.py
===================================================================
--- branches/soc-2009-yukishiro/release/scripts/bvh_import.py 2009-07-27 17:43:13 UTC (rev 21938)
+++ branches/soc-2009-yukishiro/release/scripts/bvh_import.py 2009-07-27 18:11:49 UTC (rev 21939)
@@ -277,12 +277,17 @@
for bvh_node in bvh_nodes.itervalues():
if not bvh_node.rest_tail_world:
- if len(bvh_node.children)==1:
+ if len(bvh_node.children)==0:
+ # could just fail here, but rare BVH files have childless nodes
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list