[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21971] branches/itasc: svn merge -r 21879 :21970 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/ blender
Benoit Bolsee
benoit.bolsee at online.be
Tue Jul 28 18:07:59 CEST 2009
Revision: 21971
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21971
Author: ben2610
Date: 2009-07-28 18:07:57 +0200 (Tue, 28 Jul 2009)
Log Message:
-----------
svn merge -r 21879:21970 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/itasc/blenderplayer/CMakeLists.txt
branches/itasc/config/darwin-config.py
branches/itasc/config/win32-mingw-config.py
branches/itasc/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/itasc/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/itasc/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/itasc/release/datafiles/splash.jpg
branches/itasc/release/io/export_ply.py
branches/itasc/release/scripts/bpymodules/colladaImEx/translator.py
branches/itasc/release/scripts/bvh_import.py
branches/itasc/release/scripts/collada_export.py
branches/itasc/release/scripts/export_dxf.py
branches/itasc/release/scripts/export_fbx.py
branches/itasc/release/scripts/export_map.py
branches/itasc/release/scripts/export_obj.py
branches/itasc/release/scripts/import_dxf.py
branches/itasc/release/scripts/import_obj.py
branches/itasc/release/scripts/object_active_to_other.py
branches/itasc/release/scripts/vertexpaint_selfshadow_ao.py
branches/itasc/release/ui/bpy_ops.py
branches/itasc/release/ui/buttons_data_armature.py
branches/itasc/release/ui/buttons_data_bone.py
branches/itasc/release/ui/buttons_data_camera.py
branches/itasc/release/ui/buttons_data_curve.py
branches/itasc/release/ui/buttons_data_empty.py
branches/itasc/release/ui/buttons_data_lamp.py
branches/itasc/release/ui/buttons_data_lattice.py
branches/itasc/release/ui/buttons_data_mesh.py
branches/itasc/release/ui/buttons_data_modifier.py
branches/itasc/release/ui/buttons_data_text.py
branches/itasc/release/ui/buttons_game.py
branches/itasc/release/ui/buttons_material.py
branches/itasc/release/ui/buttons_object_constraint.py
branches/itasc/release/ui/buttons_particle.py
branches/itasc/release/ui/buttons_physics_cloth.py
branches/itasc/release/ui/buttons_physics_field.py
branches/itasc/release/ui/buttons_physics_fluid.py
branches/itasc/release/ui/buttons_physics_softbody.py
branches/itasc/release/ui/buttons_texture.py
branches/itasc/release/ui/buttons_world.py
branches/itasc/release/ui/space_buttons.py
branches/itasc/release/ui/space_console.py
branches/itasc/release/ui/space_filebrowser.py
branches/itasc/release/ui/space_info.py
branches/itasc/release/ui/space_outliner.py
branches/itasc/release/ui/space_sequencer.py
branches/itasc/release/ui/space_text.py
branches/itasc/release/ui/space_view3d.py
branches/itasc/release/ui/space_view3d_toolbar.py
branches/itasc/release/windows/extra/python26.zip
branches/itasc/source/blender/avi/intern/avi.c
branches/itasc/source/blender/blenkernel/BKE_softbody.h
branches/itasc/source/blender/blenkernel/intern/boids.c
branches/itasc/source/blender/blenkernel/intern/image.c
branches/itasc/source/blender/blenkernel/intern/mesh.c
branches/itasc/source/blender/blenkernel/intern/particle.c
branches/itasc/source/blender/blenkernel/intern/particle_system.c
branches/itasc/source/blender/blenkernel/intern/screen.c
branches/itasc/source/blender/blenkernel/intern/softbody.c
branches/itasc/source/blender/blenlib/BLI_arithb.h
branches/itasc/source/blender/blenlib/BLI_kdtree.h
branches/itasc/source/blender/blenlib/BLI_storage_types.h
branches/itasc/source/blender/blenlib/intern/arithb.c
branches/itasc/source/blender/blenlib/intern/fileops.c
branches/itasc/source/blender/blenlib/intern/storage.c
branches/itasc/source/blender/blenloader/intern/readfile.c
branches/itasc/source/blender/editors/animation/anim_channels.c
branches/itasc/source/blender/editors/animation/anim_draw.c
branches/itasc/source/blender/editors/animation/anim_filter.c
branches/itasc/source/blender/editors/animation/anim_markers.c
branches/itasc/source/blender/editors/armature/armature_intern.h
branches/itasc/source/blender/editors/armature/armature_ops.c
branches/itasc/source/blender/editors/armature/editarmature.c
branches/itasc/source/blender/editors/armature/poseobject.c
branches/itasc/source/blender/editors/include/ED_anim_api.h
branches/itasc/source/blender/editors/include/ED_armature.h
branches/itasc/source/blender/editors/include/ED_fileselect.h
branches/itasc/source/blender/editors/include/ED_object.h
branches/itasc/source/blender/editors/include/UI_interface.h
branches/itasc/source/blender/editors/interface/interface.c
branches/itasc/source/blender/editors/interface/interface_handlers.c
branches/itasc/source/blender/editors/interface/interface_intern.h
branches/itasc/source/blender/editors/interface/view2d_ops.c
branches/itasc/source/blender/editors/object/editconstraint.c
branches/itasc/source/blender/editors/object/object_edit.c
branches/itasc/source/blender/editors/object/object_intern.h
branches/itasc/source/blender/editors/object/object_ops.c
branches/itasc/source/blender/editors/physics/editparticle.c
branches/itasc/source/blender/editors/screen/screen_context.c
branches/itasc/source/blender/editors/screen/screen_ops.c
branches/itasc/source/blender/editors/sculpt_paint/paint_vertex.c
branches/itasc/source/blender/editors/space_buttons/buttons_context.c
branches/itasc/source/blender/editors/space_buttons/space_buttons.c
branches/itasc/source/blender/editors/space_console/console_draw.c
branches/itasc/source/blender/editors/space_console/console_intern.h
branches/itasc/source/blender/editors/space_console/console_ops.c
branches/itasc/source/blender/editors/space_console/space_console.c
branches/itasc/source/blender/editors/space_file/file_draw.c
branches/itasc/source/blender/editors/space_file/file_intern.h
branches/itasc/source/blender/editors/space_file/file_ops.c
branches/itasc/source/blender/editors/space_file/file_panels.c
branches/itasc/source/blender/editors/space_file/filelist.c
branches/itasc/source/blender/editors/space_file/filesel.c
branches/itasc/source/blender/editors/space_file/fsmenu.c
branches/itasc/source/blender/editors/space_file/space_file.c
branches/itasc/source/blender/editors/space_graph/graph_draw.c
branches/itasc/source/blender/editors/space_graph/graph_edit.c
branches/itasc/source/blender/editors/space_graph/graph_header.c
branches/itasc/source/blender/editors/space_graph/graph_select.c
branches/itasc/source/blender/editors/space_image/image_ops.c
branches/itasc/source/blender/editors/space_nla/nla_channels.c
branches/itasc/source/blender/editors/space_nla/nla_draw.c
branches/itasc/source/blender/editors/space_nla/nla_edit.c
branches/itasc/source/blender/editors/space_outliner/outliner.c
branches/itasc/source/blender/editors/space_outliner/outliner_header.c
branches/itasc/source/blender/editors/space_outliner/outliner_intern.h
branches/itasc/source/blender/editors/space_outliner/outliner_ops.c
branches/itasc/source/blender/editors/space_outliner/space_outliner.c
branches/itasc/source/blender/editors/space_view3d/space_view3d.c
branches/itasc/source/blender/editors/space_view3d/view3d_header.c
branches/itasc/source/blender/editors/space_view3d/view3d_intern.h
branches/itasc/source/blender/editors/space_view3d/view3d_ops.c
branches/itasc/source/blender/editors/space_view3d/view3d_select.c
branches/itasc/source/blender/editors/space_view3d/view3d_toolbar.c
branches/itasc/source/blender/imbuf/intern/IMB_targa.h
branches/itasc/source/blender/imbuf/intern/iris.c
branches/itasc/source/blender/imbuf/intern/readimage.c
branches/itasc/source/blender/imbuf/intern/targa.c
branches/itasc/source/blender/imbuf/intern/util.c
branches/itasc/source/blender/makesdna/DNA_action_types.h
branches/itasc/source/blender/makesdna/DNA_brush_types.h
branches/itasc/source/blender/makesdna/DNA_material_types.h
branches/itasc/source/blender/makesdna/DNA_object_force.h
branches/itasc/source/blender/makesdna/DNA_scene_types.h
branches/itasc/source/blender/makesdna/DNA_space_types.h
branches/itasc/source/blender/makesdna/DNA_userdef_types.h
branches/itasc/source/blender/makesdna/DNA_windowmanager_types.h
branches/itasc/source/blender/makesrna/RNA_access.h
branches/itasc/source/blender/makesrna/intern/makesrna.c
branches/itasc/source/blender/makesrna/intern/rna_access.c
branches/itasc/source/blender/makesrna/intern/rna_brush.c
branches/itasc/source/blender/makesrna/intern/rna_define.c
branches/itasc/source/blender/makesrna/intern/rna_internal.h
branches/itasc/source/blender/makesrna/intern/rna_material.c
branches/itasc/source/blender/makesrna/intern/rna_mesh.c
branches/itasc/source/blender/makesrna/intern/rna_modifier.c
branches/itasc/source/blender/makesrna/intern/rna_object_api.c
branches/itasc/source/blender/makesrna/intern/rna_render.c
branches/itasc/source/blender/makesrna/intern/rna_rna.c
branches/itasc/source/blender/makesrna/intern/rna_scene.c
branches/itasc/source/blender/makesrna/intern/rna_space.c
branches/itasc/source/blender/makesrna/intern/rna_ui.c
branches/itasc/source/blender/makesrna/intern/rna_userdef.c
branches/itasc/source/blender/makesrna/intern/rna_wm.c
branches/itasc/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c
branches/itasc/source/blender/python/epy_doc_gen.py
branches/itasc/source/blender/python/intern/bpy_interface.c
branches/itasc/source/blender/python/intern/bpy_operator.c
branches/itasc/source/blender/python/intern/bpy_operator_wrap.c
branches/itasc/source/blender/python/intern/bpy_rna.c
branches/itasc/source/blender/render/extern/include/RE_pipeline.h
branches/itasc/source/blender/render/intern/source/convertblender.c
branches/itasc/source/blender/render/intern/source/pipeline.c
branches/itasc/source/blender/render/intern/source/rayshade.c
branches/itasc/source/blender/render/intern/source/shadbuf.c
branches/itasc/source/blender/render/intern/source/shadeinput.c
branches/itasc/source/blender/render/intern/source/shadeoutput.c
branches/itasc/source/blender/render/intern/source/texture.c
branches/itasc/source/blender/render/intern/source/zbuf.c
branches/itasc/source/blender/windowmanager/WM_api.h
branches/itasc/source/blender/windowmanager/intern/wm_event_system.c
branches/itasc/source/blender/windowmanager/intern/wm_keymap.c
branches/itasc/source/blender/windowmanager/intern/wm_operators.c
branches/itasc/source/blender/windowmanager/wm_event_types.h
branches/itasc/source/creator/CMakeLists.txt
branches/itasc/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/itasc/source/gameengine/Converter/BL_ActionActuator.cpp
branches/itasc/source/gameengine/Converter/BL_ActionActuator.h
branches/itasc/source/gameengine/Converter/BL_ArmatureActuator.cpp
branches/itasc/source/gameengine/Converter/BL_ArmatureObject.h
branches/itasc/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/itasc/source/gameengine/Converter/BL_MeshDeformer.h
branches/itasc/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/itasc/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/itasc/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/itasc/source/gameengine/Ketsji/KX_GameObject.cpp
branches/itasc/source/gameengine/Ketsji/KX_GameObject.h
branches/itasc/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/itasc/source/gameengine/Ketsji/KX_MeshProxy.h
branches/itasc/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/itasc/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/itasc/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/itasc/source/gameengine/PyDoc/API_intro.py
branches/itasc/source/gameengine/PyDoc/GameTypes.py
branches/itasc/source/gameengine/Rasterizer/RAS_Deformer.h
branches/itasc/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/itasc/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/itasc/tools/Blender.py
Added Paths:
-----------
branches/itasc/release/io/engine_render_pov.py
branches/itasc/release/ui/buttons_object.py
branches/itasc/source/blender/makesrna/intern/rna_sculpt_paint.c
Removed Paths:
-------------
branches/itasc/ChangeLog
branches/itasc/release/ui/buttons_objects.py
branches/itasc/source/blender/makesrna/intern/rna_vpaint.c
Deleted: branches/itasc/ChangeLog
===================================================================
--- branches/itasc/ChangeLog 2009-07-28 12:08:54 UTC (rev 21970)
+++ branches/itasc/ChangeLog 2009-07-28 16:07:57 UTC (rev 21971)
@@ -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/itasc/blenderplayer/CMakeLists.txt
===================================================================
--- branches/itasc/blenderplayer/CMakeLists.txt 2009-07-28 12:08:54 UTC (rev 21970)
+++ branches/itasc/blenderplayer/CMakeLists.txt 2009-07-28 16:07:57 UTC (rev 21971)
@@ -69,7 +69,6 @@
bf_blenkernel
verse
bf_blenkernel
- bf_decimation
bf_blenloader
bf_blenpluginapi
bf_blroutines
Modified: branches/itasc/config/darwin-config.py
===================================================================
--- branches/itasc/config/darwin-config.py 2009-07-28 12:08:54 UTC (rev 21970)
+++ branches/itasc/config/darwin-config.py 2009-07-28 16:07:57 UTC (rev 21971)
@@ -10,8 +10,6 @@
# IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs
USE_SDK=True
-BF_PYTHON_VERSION = '2.3'
-
cmd = 'uname -p'
MAC_PROC=commands.getoutput(cmd)
cmd = 'uname -r'
@@ -32,9 +30,12 @@
if MAC_PROC== 'powerpc' and BF_PYTHON_VERSION == '2.3':
MAC_MIN_VERS = '10.3'
MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
-else:
+elif MAC_CUR_VER=='10.4':
MAC_MIN_VERS = '10.4'
MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+else:
+ MAC_MIN_VERS = '10.5'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
# enable ffmpeg support
@@ -46,24 +47,35 @@
#BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
#BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
-# python.org libs install in /library we want to use that for 2.5
-#
-# if you want py2.5 on leopard without installing
-# change value to BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
-# BEWARE: in that case it will work only on leopard
+BF_PYTHON_VERSION = '3.1'
-if BF_PYTHON_VERSION=='2.3':
- BF_PYTHON = '/System/Library/Frameworks/Python.framework/Versions/'
+if BF_PYTHON_VERSION=='3.1':
+ # python 3.1 uses precompiled libraries in bf svn /lib by default
+
+ BF_PYTHON = LIBDIR + '/python'
+ BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+ # BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
+ BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
+ BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}'
+ # BF_PYTHON_LINKFLAGS = '-u _PyMac_Error -framework System'
else:
- BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
+ # python 2.5 etc. uses built-in framework
-BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}'
-BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
-BF_PYTHON_LIB = ''
-BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config'
-BF_PYTHON_LINKFLAGS = '-u _PyMac_Error -framework System -framework Python'
-if MAC_CUR_VER=='10.3' or MAC_CUR_VER=='10.4':
- BF_PYTHON_LINKFLAGS ='-u __dummy '+BF_PYTHON_LINKFLAGS
+ # python.org libs install in /library we want to use that for 2.5
+ #
+ # if you want py2.5 on leopard without installing
+ # change value to BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
+ # BEWARE: in that case it will work only on leopard
+
+ BF_PYTHON = '/System/Library/Frameworks/Python.framework/Versions/'
+
+ BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}'
+ BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
+ BF_PYTHON_LIB = ''
+ BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config'
+ BF_PYTHON_LINKFLAGS = '-u _PyMac_Error -framework System -framework Python'
+ if MAC_CUR_VER=='10.3' or MAC_CUR_VER=='10.4':
+ BF_PYTHON_LINKFLAGS ='-u __dummy '+BF_PYTHON_LINKFLAGS
BF_QUIET = '1'
WITH_BF_OPENMP = '0'
Modified: branches/itasc/config/win32-mingw-config.py
===================================================================
--- branches/itasc/config/win32-mingw-config.py 2009-07-28 12:08:54 UTC (rev 21970)
+++ branches/itasc/config/win32-mingw-config.py 2009-07-28 16:07:57 UTC (rev 21971)
@@ -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/itasc/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/itasc/intern/ghost/intern/GHOST_WindowWin32.cpp 2009-07-28 12:08:54 UTC (rev 21970)
+++ branches/itasc/intern/ghost/intern/GHOST_WindowWin32.cpp 2009-07-28 16:07:57 UTC (rev 21971)
@@ -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/itasc/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
===================================================================
--- branches/itasc/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj 2009-07-28 12:08:54 UTC (rev 21970)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list