[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36629] branches/bmesh/blender: svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Campbell Barton
ideasman42 at gmail.com
Thu May 12 07:35:20 CEST 2011
Revision: 36629
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36629
Author: campbellbarton
Date: 2011-05-12 05:35:19 +0000 (Thu, 12 May 2011)
Log Message:
-----------
svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36603
Modified Paths:
--------------
branches/bmesh/blender/doc/doxygen/doxygen.source
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h
branches/bmesh/blender/source/blender/CMakeLists.txt
branches/bmesh/blender/source/blender/SConscript
branches/bmesh/blender/source/blender/blenkernel/BKE_brush.h
branches/bmesh/blender/source/blender/blenkernel/intern/brush.c
branches/bmesh/blender/source/blender/blenloader/CMakeLists.txt
branches/bmesh/blender/source/blender/blenloader/SConscript
branches/bmesh/blender/source/blender/blenloader/intern/readblenentry.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/physics/particle_edit.c
branches/bmesh/blender/source/blender/editors/physics/physics_intern.h
branches/bmesh/blender/source/blender/editors/physics/physics_ops.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_intern.h
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_ops.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/bmesh/blender/source/blender/makesdna/DNA_windowmanager_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_smoke.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
branches/bmesh/blender/source/blender/windowmanager/WM_api.h
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/blenderplayer/CMakeLists.txt
branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/bmesh/blender/source/creator/CMakeLists.txt
branches/bmesh/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/bmesh/blender/source/gameengine/GamePlayer/ghost/SConscript
Added Paths:
-----------
branches/bmesh/blender/source/blender/blenloader/BLO_runtime.h
branches/bmesh/blender/source/blender/blenloader/intern/runtime.c
Removed Paths:
-------------
branches/bmesh/blender/source/blender/readblenfile/
branches/bmesh/blender/source/tools/darwin/
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:31524-36603
+ /trunk/blender:31524-36628
Modified: branches/bmesh/blender/doc/doxygen/doxygen.source
===================================================================
--- branches/bmesh/blender/doc/doxygen/doxygen.source 2011-05-12 01:57:47 UTC (rev 36628)
+++ branches/bmesh/blender/doc/doxygen/doxygen.source 2011-05-12 05:35:19 UTC (rev 36629)
@@ -145,10 +145,6 @@
* merged in docs.
*/
-/** \defgroup blo readblenfile
- * \ingroup blender data
- */
-
/** \defgroup quicktime quicktime
* \ingroup blender
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2011-05-12 01:57:47 UTC (rev 36628)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2011-05-12 05:35:19 UTC (rev 36629)
@@ -42,7 +42,7 @@
#include <iostream>
#ifdef FREE_WINDOWS
-# define _WIN32_WINNT 0x0500 /* GetConsoleWindow() for MinGW */
+# define WINVER 0x0501 /* GetConsoleWindow() for MinGW */
#endif
#include "GHOST_SystemWin32.h"
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h 2011-05-12 01:57:47 UTC (rev 36628)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h 2011-05-12 05:35:19 UTC (rev 36629)
@@ -127,9 +127,7 @@
#ifdef FREE_WINDOWS
#define NEED_RAW_PROC
typedef BOOL (WINAPI * LPFNDLLRRID)(RAWINPUTDEVICE*,UINT, UINT);
-#define RegisterRawInputDevices(pRawInputDevices, uiNumDevices, cbSize) ((pRegisterRawInputDevices)?pRegisterRawInputDevices(pRawInputDevices, uiNumDevices, cbSize):0)
-
typedef UINT (WINAPI * LPFNDLLGRID)(HRAWINPUT, UINT, LPVOID, PUINT, UINT);
#define GetRawInputData(hRawInput, uiCommand, pData, pcbSize, cbSizeHeader) ((pGetRawInputData)?pGetRawInputData(hRawInput, uiCommand, pData, pcbSize, cbSizeHeader):(UINT)-1)
#endif
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-36628
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-36603
+ /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-36628
Modified: branches/bmesh/blender/source/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/source/blender/CMakeLists.txt 2011-05-12 01:57:47 UTC (rev 36628)
+++ branches/bmesh/blender/source/blender/CMakeLists.txt 2011-05-12 05:35:19 UTC (rev 36629)
@@ -92,7 +92,6 @@
add_subdirectory(render)
add_subdirectory(blenfont)
add_subdirectory(blenloader)
-add_subdirectory(readblenfile)
add_subdirectory(blenpluginapi)
add_subdirectory(ikplugin)
add_subdirectory(gpu)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list