Merge with 2.5 -r 21788:22040.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Thu, 30 Jul 2009 08:22:51 +0000 (08:22 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Thu, 30 Jul 2009 08:22:51 +0000 (08:22 +0000)
340 files changed:
1  2 
CMakeLists.txt
blenderplayer/CMakeLists.txt
config/darwin-config.py
config/win32-mingw-config.py
intern/ghost/intern/GHOST_SystemX11.cpp
intern/ghost/intern/GHOST_WindowWin32.cpp
projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
projectfiles_vc9/blender/blender.sln
projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
projectfiles_vc9/blender/editors/ED_editors.vcproj
projectfiles_vc9/blender/loader/BLO_loader.vcproj
projectfiles_vc9/blender/makesdna/DNA_makesdna.vcproj
projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
projectfiles_vc9/blender/nodes/nodes.vcproj
projectfiles_vc9/blender/render/BRE_render.vcproj
release/datafiles/blenderbuttons
release/io/engine_render_pov.py
release/io/export_ply.py
release/ui/bpy_ops.py
release/ui/buttons_data_armature.py
release/ui/buttons_data_bone.py
release/ui/buttons_data_camera.py
release/ui/buttons_data_curve.py
release/ui/buttons_data_empty.py
release/ui/buttons_data_lamp.py
release/ui/buttons_data_lattice.py
release/ui/buttons_data_mesh.py
release/ui/buttons_data_metaball.py
release/ui/buttons_data_modifier.py
release/ui/buttons_data_text.py
release/ui/buttons_game.py
release/ui/buttons_material.py
release/ui/buttons_object.py
release/ui/buttons_object_constraint.py
release/ui/buttons_particle.py
release/ui/buttons_physics_cloth.py
release/ui/buttons_physics_field.py
release/ui/buttons_physics_fluid.py
release/ui/buttons_physics_softbody.py
release/ui/buttons_scene.py
release/ui/buttons_texture.py
release/ui/buttons_world.py
release/ui/space_buttons.py
release/ui/space_console.py
release/ui/space_filebrowser.py
release/ui/space_image.py
release/ui/space_info.py
release/ui/space_logic.py
release/ui/space_outliner.py
release/ui/space_sequencer.py
release/ui/space_text.py
release/ui/space_view3d.py
release/ui/space_view3d_toolbar.py
source/Makefile
source/blender/blenfont/intern/blf.c
source/blender/blenfont/intern/blf_glyph.c
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_context.h
source/blender/blenkernel/BKE_nla.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/BKE_pointcache.h
source/blender/blenkernel/BKE_sketch.h
source/blender/blenkernel/BKE_softbody.h
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/boids.c
source/blender/blenkernel/intern/context.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/exotic.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/nla.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/screen.c
source/blender/blenkernel/intern/sketch.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenkernel/intern/texture.c
source/blender/blenkernel/intern/world.c
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/BLI_kdtree.h
source/blender/blenlib/BLI_storage_types.h
source/blender/blenlib/intern/arithb.c
source/blender/blenlib/intern/fileops.c
source/blender/blenlib/intern/storage.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/Makefile
source/blender/editors/SConscript
source/blender/editors/animation/anim_channels.c
source/blender/editors/animation/anim_draw.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/anim_markers.c
source/blender/editors/animation/anim_ops.c
source/blender/editors/animation/keyframing.c
source/blender/editors/animation/keyingsets.c
source/blender/editors/armature/armature_intern.h
source/blender/editors/armature/armature_ops.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/editarmature_sketch.c
source/blender/editors/armature/poseobject.c
source/blender/editors/curve/editcurve.c
source/blender/editors/curve/editfont.c
source/blender/editors/datafiles/B.blend.c
source/blender/editors/datafiles/blenderbuttons.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/ED_armature.h
source/blender/editors/include/ED_fileselect.h
source/blender/editors/include/ED_keyframing.h
source/blender/editors/include/ED_mball.h
source/blender/editors/include/ED_object.h
source/blender/editors/include/ED_screen.h
source/blender/editors/include/ED_util.h
source/blender/editors/include/UI_icons.h
source/blender/editors/include/UI_interface.h
source/blender/editors/include/UI_view2d.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_anim.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_panel.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/interface/interface_style.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_utils.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/view2d.c
source/blender/editors/interface/view2d_ops.c
source/blender/editors/mesh/editmesh_add.c
source/blender/editors/mesh/editmesh_loop.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/metaball/Makefile
source/blender/editors/metaball/SConscript
source/blender/editors/metaball/editmball.c
source/blender/editors/metaball/mball_intern.h
source/blender/editors/metaball/mball_ops.c
source/blender/editors/object/editconstraint.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/physics/editparticle.c
source/blender/editors/screen/area.c
source/blender/editors/screen/screen_context.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_intern.h
source/blender/editors/screen/screen_ops.c
source/blender/editors/screen/screendump.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_action/action_draw.c
source/blender/editors/space_action/action_header.c
source/blender/editors/space_action/space_action.c
source/blender/editors/space_api/spacetypes.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_buttons/buttons_header.c
source/blender/editors/space_buttons/buttons_intern.h
source/blender/editors/space_buttons/buttons_ops.c
source/blender/editors/space_buttons/space_buttons.c
source/blender/editors/space_console/console_draw.c
source/blender/editors/space_console/console_intern.h
source/blender/editors/space_console/console_ops.c
source/blender/editors/space_console/space_console.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_intern.h
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/file_panels.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_file/fsmenu.c
source/blender/editors/space_file/space_file.c
source/blender/editors/space_graph/graph_buttons.c
source/blender/editors/space_graph/graph_draw.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_graph/graph_header.c
source/blender/editors/space_graph/graph_ops.c
source/blender/editors/space_graph/graph_select.c
source/blender/editors/space_graph/space_graph.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_draw.c
source/blender/editors/space_image/image_header.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_info/info_ops.c
source/blender/editors/space_info/space_info.c
source/blender/editors/space_logic/logic_buttons.c
source/blender/editors/space_logic/logic_header.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_logic/space_logic.c
source/blender/editors/space_nla/nla_channels.c
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_nla/nla_edit.c
source/blender/editors/space_nla/nla_header.c
source/blender/editors/space_nla/space_nla.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_header.c
source/blender/editors/space_node/node_select.c
source/blender/editors/space_node/node_state.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_outliner/outliner_header.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_outliner/outliner_ops.c
source/blender/editors/space_outliner/space_outliner.c
source/blender/editors/space_sequencer/sequencer_add.c
source/blender/editors/space_sequencer/sequencer_ops.c
source/blender/editors/space_sequencer/space_sequencer.c
source/blender/editors/space_text/space_text.c
source/blender/editors/space_text/text_ops.c
source/blender/editors/space_time/space_time.c
source/blender/editors/space_time/time_header.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_input.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/util/editmode_undo.c
source/blender/editors/util/undo.c
source/blender/editors/util/util_intern.h
source/blender/editors/uvedit/uvedit_ops.c
source/blender/imbuf/intern/IMB_targa.h
source/blender/imbuf/intern/readimage.c
source/blender/imbuf/intern/targa.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_anim_types.h
source/blender/makesdna/DNA_brush_types.h
source/blender/makesdna/DNA_camera_types.h
source/blender/makesdna/DNA_lamp_types.h
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_meta_types.h
source/blender/makesdna/DNA_object_force.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_particle_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_screen_types.h
source/blender/makesdna/DNA_scriptlink_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_texture_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_view2d_types.h
source/blender/makesdna/DNA_windowmanager_types.h
source/blender/makesdna/DNA_world_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_armature.c
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_define.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_lamp.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_meta.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/makesrna/intern/rna_particle.c
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_rna.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_texture.c
source/blender/makesrna/intern/rna_ui.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/makesrna/intern/rna_wm.c
source/blender/makesrna/intern/rna_world.c
source/blender/python/BPY_extern.h
source/blender/python/epy_doc_gen.py
source/blender/python/intern/bpy_interface.c
source/blender/python/intern/bpy_operator.c
source/blender/python/intern/bpy_operator_wrap.c
source/blender/python/intern/bpy_rna.c
source/blender/python/intern/bpy_rna.h
source/blender/python/intern/bpy_ui.c
source/blender/python/intern/stubs.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/imagetexture.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/shadbuf.c
source/blender/render/intern/source/shadeinput.c
source/blender/render/intern/source/texture.c
source/blender/render/intern/source/zbuf.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm.c
source/blender/windowmanager/intern/wm_cursors.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_jobs.c
source/blender/windowmanager/intern/wm_keymap.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c
source/blender/windowmanager/wm.h
source/blender/windowmanager/wm_event_types.h
source/blender/windowmanager/wm_window.h
source/creator/CMakeLists.txt
source/creator/creator.c
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
source/gameengine/Converter/BL_ActionActuator.cpp
source/gameengine/Converter/BL_ActionActuator.h
source/gameengine/Converter/BL_ArmatureObject.h
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_MeshProxy.cpp
source/gameengine/Ketsji/KX_MeshProxy.h
source/gameengine/Ketsji/KX_SoundActuator.cpp
source/gameengine/PyDoc/GameTypes.py
tools/Blender.py

diff --cc CMakeLists.txt
@@@ -328,28 -331,22 +328,40 @@@ IF(APPLE
      SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
    ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
  
 -  INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake)
 -  IF(OPENAL_FOUND)
 -    SET(WITH_OPENAL ON)
 -    SET(OPENAL_LIB ${OPENAL_LIBRARY})
 -    SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
 -  ELSE(OPENAL_FOUND)
 -    SET(WITH_OPENAL OFF)
 -  ENDIF(OPENAL_FOUND)
 +  IF(WITH_OPENAL)
 +    FIND_PACKAGE(OpenAL)
 +    IF(OPENAL_FOUND)
 +      SET(WITH_OPENAL ON)
 +      SET(OPENAL_LIB ${OPENAL_LIBRARY})
 +      SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
 +    ELSE(OPENAL_FOUND)
 +      SET(WITH_OPENAL OFF)
 +    ENDIF(OPENAL_FOUND)
 +  ENDIF(WITH_OPENAL)
  
--  SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
-   SET(PYTHON_VERSION 2.5)
 -  SET(PYTHON_VERSION 2.3)
--  SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
--  SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "")
--  SET(PYTHON_LIB "")
--  SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
-   IF(CMAKE_SYSTEM_VERSION GREATER 10.4)
-       SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
-   ELSE(CMAKE_SYSTEM_VERSION GREATER 10.4)
 -  SET(PYTHON_LINKFLAGS "-u __dummy -u _PyMac_Error -framework System -framework Python")
++
++  SET(PYTHON_VERSION 3.1)
++
++  IF(PYTHON_VERSION MATCHES 3.1)
++    # we use precompiled libraries for py 3.1 and up by default
++
++    SET(PYTHON ${LIBDIR}/python)
++    SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
++    SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "")
++    SET(PYTHON_LIB python${PYTHON_VERSION})
++    SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
++    #    SET(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
++  ELSE(PYTHON_VERSION MATCHES 3.1)
++    # otherwise, use custom system framework
++
++    SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
++    SET(PYTHON_VERSION 2.5)
++    SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
++    SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "")
++    SET(PYTHON_LIB "")
++    SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
 +    SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
-   ENDIF(CMAKE_SYSTEM_VERSION GREATER 10.4)
++  ENDIF(PYTHON_VERSION MATCHES 3.1)
  
    SET(GETTEXT ${LIBDIR}/gettext)
    SET(GETTEXT_INC "${GETTEXT}/include")
Simple merge
@@@ -10,8 -10,8 +10,6 @@@ import command
  # 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 -32,9 +30,12 @@@ LIBDIR = '${LCGDIR}
  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 -46,30 +47,35 @@@ if USE_SDK==True
  #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
 -WITH_BF_VERSE = False
 -BF_VERSE = "#extern/verse/dist"
 -BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
 -BF_VERSE_INCLUDE = BF_VERSE
 -BF_VERSE_LIBS = "libverse"
++BF_PYTHON_VERSION = '3.1'
  
- if BF_PYTHON_VERSION=='2.3':
-       BF_PYTHON = '/System/Library/Frameworks/Python.framework/Versions/'
 -# 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
++if BF_PYTHON_VERSION=='3.1':
++      # python 3.1 uses precompiled libraries in bf svn /lib by default
 -if BF_PYTHON_VERSION=='2.3':
 -      BF_PYTHON = '/System/Library/Frameworks/Python.framework/Versions/'
++      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/'
 -
 -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 2.5 etc. uses built-in framework
++
++      # 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_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'
@@@ -1,9 -1,12 +1,10 @@@
  LCGDIR = '#../lib/windows'
  LIBDIR = "${LCGDIR}"
  
 -WITH_BF_VERSE = False
 -BF_VERSE_INCLUDE = "#extern/verse/dist"
 -
  BF_PYTHON = LIBDIR + '/python'
 -BF_PYTHON_VERSION = '2.5'
 +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'
@@@ -117,18 -116,17 +117,34 @@@ GHOST_WindowWin32::GHOST_WindowWin32
        m_maxPressure(0)
  {
        if (state != GHOST_kWindowStateFullScreen) {
-               // take taskbar into account
 -                      /* Convert client size into window size */
 +              RECT rect;
++              GHOST_TUns32 tw, th; 
++
+               width += GetSystemMetrics(SM_CXSIZEFRAME)*2;
+               height += GetSystemMetrics(SM_CYSIZEFRAME)*2 + GetSystemMetrics(SM_CYCAPTION);
++              // take taskbar into account
 +              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
++                      left,                                   // horizontal position of window
++                      top,                                    // vertical position of window
                        width,                                          // window width
                        height,                                         // window height
                        0,                                                      // handle to parent or owner window
                                        >\r
                                </File>\r
                                <File\r
 -                                      RelativePath="..\..\..\source\blender\python\api2_2x\constant.c"\r
 +                                      RelativePath="..\..\..\source\blender\python\intern\bpy_rna.c"\r
                                        >\r
                                </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\source\blender\python\intern\bpy_scriptlink.c"\r
-                                       >\r
-                               </File>\r
                                <File\r
 -                                      RelativePath="..\..\..\source\blender\python\api2_2x\CurNurb.c"\r
 +                                      RelativePath="..\..\..\source\blender\python\intern\bpy_ui.c"\r
                                        >\r
                                </File>\r
                                <File\r
@@@ -199,14 -210,15 +199,18 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject\r
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blenpluginapi", "blenpluginapi\blenpluginapi\blenpluginapi.vcproj", "{BB6AA598-B336-4F8B-9DF9-8CAE7BE71C23}"\r
  EndProject\r
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gen_messaging", "..\KERNEL\gen_messaging\gen_messaging.vcproj", "{727F90AC-ABE6-40BF-8937-C2F2F1D13DEA}"\r
 -EndProject\r
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PHY_Sumo", "..\gameengine\physics\PHY_Physics\PHY_Sumo\PHY_Sumo.vcproj", "{9625642D-6F20-4FB6-A089-BE7441B223E3}"\r
 -EndProject\r
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BRE_yafray", "yafray\BRE_yafray.vcproj", "{9991A3C3-83FE-4AFE-9E18-9D01CB57E879}"\r
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gen_messaging", "..\kernel\gen_messaging\gen_messaging.vcproj", "{727F90AC-ABE6-40BF-8937-C2F2F1D13DEA}"\r
  EndProject\r
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PHY_Bullet", "..\gameengine\physics\PHY_Physics\PHY_Bullet\PHY_Bullet.vcproj", "{E90C7BC2-CF30-4A60-A8F2-0050D592E358}"\r
 +      ProjectSection(ProjectDependencies) = postProject\r
 +              {FFD3C64A-30E2-4BC7-BC8F-51818C320400} = {FFD3C64A-30E2-4BC7-BC8F-51818C320400}\r
 +      EndProjectSection\r
  EndProject\r
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BL_nodes", "nodes\nodes.vcproj", "{4C3AB78A-52CA-4276-A041-39776E52D8C8}"\r
++      ProjectSection(ProjectDependencies) = postProject\r
++              {7495FE37-933A-4AC1-BB2A-B3FDB4DE4284} = {7495FE37-933A-4AC1-BB2A-B3FDB4DE4284}\r
++              {DFE7F3E3-E62A-4677-B666-DF0DDF70C359} = {DFE7F3E3-E62A-4677-B666-DF0DDF70C359}\r
++      EndProjectSection\r
  EndProject\r
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BL_gpu", "gpu\BL_gpu.vcproj", "{138DD16C-CC78-4F6C-A898-C8DA68D89067}"\r
  EndProject\r
                                RelativePath="..\..\..\source\blender\blenkernel\intern\bmfont.c"\r
                                >\r
                        </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\blenkernel\intern\boids.c"\r
++                              >\r
++                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\blenkernel\intern\booleanops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\blenkernel\intern\booleanops_mesh.c"\r
 +                              >\r
 +                      </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\blenkernel\intern\brush.c"\r
                                >\r
                                RelativePath="..\..\..\source\blender\blenkernel\BKE_bmfont_types.h"\r
                                >\r
                        </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\blenkernel\BKE_boids.h"\r
++                              >\r
++                      </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\blenkernel\BKE_booleanops.h"\r
                                >\r
                                RelativePath="..\..\..\source\blender\blenlib\intern\bpath.c"\r
                                >\r
                        </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\blenlib\intern\DLRB_tree.c"\r
++                              >\r
++                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\blenlib\intern\dynamiclist.c"\r
 +                              >\r
 +                      </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\blenlib\intern\dynlib.c"\r
                                >\r
                                RelativePath="..\..\..\source\blender\blenlib\intern\BLI_callbacks.h"\r
                                >\r
                        </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\blenlib\BLI_dlrbTree.h"\r
++                              >\r
++                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\blenlib\BLI_dynamiclist.h"\r
 +                              >\r
 +                      </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\blenlib\BLI_edgehash.h"\r
                                >\r
index 497560b,0000000..08432b5
mode 100644,000000..100644
--- /dev/null
@@@ -1,1421 -1,0 +1,1449 @@@
 +<?xml version="1.0" encoding="Windows-1252"?>\r
 +<VisualStudioProject\r
 +      ProjectType="Visual C++"\r
 +      Version="9,00"\r
 +      Name="ED_editors"\r
 +      ProjectGUID="{FB88301F-F725-401B-ACD7-D2ABBF333B71}"\r
 +      RootNamespace="BL_editors"\r
 +      TargetFrameworkVersion="131072"\r
 +      >\r
 +      <Platforms>\r
 +              <Platform\r
 +                      Name="Win32"\r
 +              />\r
 +      </Platforms>\r
 +      <ToolFiles>\r
 +      </ToolFiles>\r
 +      <Configurations>\r
 +              <Configuration\r
 +                      Name="Blender Release|Win32"\r
 +                      OutputDirectory="..\..\..\..\build\msvc_9\source\blender\editors"\r
 +                      IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\editors"\r
 +                      ConfigurationType="4"\r
 +                      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      CharacterSet="2"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXMLDataGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCWebServiceProxyGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCMIDLTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCLCompilerTool"\r
 +                              InlineFunctionExpansion="1"\r
 +                              AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\ghost\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\blenkey\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\editors\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenfont;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\windowmanager;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"\r
 +                              PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER=1;WITH_QUICKTIME;INTERNATIONAL;WITH_FREETYPE2;WITH_INTERNATIONAL;WITH_OPENEXR;WITH_DDS;WITH_BULLET=1;WITH_FFMPEG"\r
 +                              StringPooling="true"\r
 +                              RuntimeLibrary="0"\r
 +                              EnableFunctionLevelLinking="true"\r
 +                              DefaultCharIsUnsigned="true"\r
 +                              UsePrecompiledHeader="0"\r
 +                              PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\src\BL_editors.pch"\r
 +                              AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\editors\"\r
 +                              ObjectFile="..\..\..\..\build\msvc_9\source\blender\editors\"\r
 +                              ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\editors\"\r
 +                              WarningLevel="2"\r
 +                              SuppressStartupBanner="true"\r
 +                              CompileAs="0"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManagedResourceCompilerTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCResourceCompilerTool"\r
 +                              PreprocessorDefinitions="NDEBUG"\r
 +                              Culture="1033"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPreLinkEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCLibrarianTool"\r
 +                              OutputFile="..\..\..\..\build\msvc_9\libs\BL_editors.lib"\r
 +                              SuppressStartupBanner="true"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCALinkTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXDCMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCBscMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCFxCopTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPostBuildEventTool"\r
 +                      />\r
 +              </Configuration>\r
 +              <Configuration\r
 +                      Name="Blender Debug|Win32"\r
 +                      OutputDirectory="..\..\..\..\build\msvc_9\source\blender\editors\debug"\r
 +                      IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\editors\debug"\r
 +                      ConfigurationType="4"\r
 +                      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      CharacterSet="2"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXMLDataGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCWebServiceProxyGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCMIDLTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCLCompilerTool"\r
 +                              Optimization="0"\r
 +                              AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.6;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\ghost\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\blenkey\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\editors\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenfont;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\windowmanager;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"\r
 +                              PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER=1;WITH_QUICKTIME;INTERNATIONAL;WITH_BF_INTERNATIONAL;WITH_FREETYPE2;WITH_OPENEXR;WITH_DDS;WITH_BULLET = 1;WITH_FFMPEG"\r
 +                              BasicRuntimeChecks="3"\r
 +                              RuntimeLibrary="1"\r
 +                              DefaultCharIsUnsigned="true"\r
 +                              UsePrecompiledHeader="0"\r
 +                              PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\src\debug\editors_src.pch"\r
 +                              AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\editors\debug\"\r
 +                              ObjectFile="..\..\..\..\build\msvc_9\source\blender\editors\debug\"\r
 +                              ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\editors\debug\"\r
 +                              WarningLevel="4"\r
 +                              SuppressStartupBanner="true"\r
 +                              DebugInformationFormat="3"\r
 +                              CompileAs="0"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManagedResourceCompilerTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCResourceCompilerTool"\r
 +                              PreprocessorDefinitions="_DEBUG"\r
 +                              Culture="1033"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPreLinkEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCLibrarianTool"\r
 +                              OutputFile="..\..\..\..\build\msvc_9\libs\debug\BL_editors.lib"\r
 +                              SuppressStartupBanner="true"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCALinkTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXDCMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCBscMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCFxCopTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPostBuildEventTool"\r
 +                      />\r
 +              </Configuration>\r
 +      </Configurations>\r
 +      <References>\r
 +      </References>\r
 +      <Files>\r
 +              <Filter\r
 +                      Name="include"\r
 +                      Filter="h"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\BIF_gl.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\BIF_glutil.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_anim_api.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_armature.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_curve.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_datafiles.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_editparticle.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_fileselect.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_fluidsim.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_gpencil.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_image.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_interface.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_keyframes_draw.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_keyframes_edit.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_keyframing.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_markers.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_mesh.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_node.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_object.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_particle.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_physics.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_pointcache.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_previewrender.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_retopo.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_screen.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_screen_types.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_sculpt.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_sequencer.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_space_api.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_text.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_transform.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_types.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_util.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_uvedit.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\ED_view3d.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\UI_icons.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\UI_interface.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\UI_interface_icons.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\UI_resources.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\include\UI_view2d.h"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="datafiles"\r
 +                      Filter="c"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\datafiles\B.blend.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\datafiles\Bfont.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\datafiles\bfont.ttf.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\datafiles\blenderbuttons.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\datafiles\bmonofont.ttf.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\datafiles\preview.blend.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\datafiles\prvicons.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\datafiles\splash.jpg.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="interface"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\interface\interface.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\interface\interface_anim.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\interface\interface_draw.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\interface\interface_handlers.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\interface\interface_icons.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\interface\interface_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\interface\interface_layout.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\interface\interface_panel.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\interface\interface_regions.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\interface\interface_style.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\interface\interface_templates.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\interface\interface_utils.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\interface\interface_widgets.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\interface\resources.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\interface\view2d.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\interface\view2d_ops.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_view3d"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_view3d\drawarmature.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_view3d\drawmesh.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_view3d\drawobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_view3d\space_view3d.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_view3d\view3d_buttons.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_view3d\view3d_draw.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_view3d\view3d_edit.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_view3d\view3d_header.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_view3d\view3d_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_view3d\view3d_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_view3d\view3d_select.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_view3d\view3d_snap.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_view3d\view3d_toolbar.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_view3d\view3d_view.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_time"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_time\space_time.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_time\time_header.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_time\time_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_time\time_ops.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_outliner"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_outliner\outliner.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_outliner\outliner_header.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_outliner\outliner_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_outliner\outliner_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_outliner\space_outliner.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="screen"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\screen\area.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\screen\glutil.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\screen\screen_context.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\screen\screen_edit.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\screen\screen_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\screen\screen_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\screen\screendump.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="util"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\util\ed_util.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\util\editmode_undo.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\util\undo.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\util\util_intern.h"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_api"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_api\space.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_api\spacetypes.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_graph"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_graph\graph_buttons.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_graph\graph_draw.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_graph\graph_edit.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_graph\graph_header.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_graph\graph_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_graph\graph_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_graph\graph_select.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_graph\graph_utils.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_graph\space_graph.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_image"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_image\image_buttons.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_image\image_draw.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_image\image_header.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_image\image_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_image\image_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_image\image_render.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_image\space_image.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_node"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_node\drawnode.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_node\node_draw.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_node\node_edit.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_node\node_header.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_node\node_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_node\node_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_node\node_select.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_node\node_state.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_node\space_node.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_buttons"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_buttons\buttons_context.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_buttons\buttons_header.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_buttons\buttons_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_buttons\buttons_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_buttons\space_buttons.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_file"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_file\file_draw.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_file\file_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_file\file_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_file\file_panels.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_file\filelist.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_file\filelist.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_file\filesel.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_file\fsmenu.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_file\fsmenu.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_file\space_file.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_file\writeimage.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_info"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_info\info_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_info\info_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_info\space_info.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_action"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_action\action_draw.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_action\action_edit.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_action\action_header.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_action\action_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_action\action_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_action\action_select.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_action\space_action.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_nla"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_nla\nla_buttons.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_nla\nla_channels.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_nla\nla_draw.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_nla\nla_edit.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_nla\nla_header.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_nla\nla_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_nla\nla_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_nla\nla_select.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_nla\space_nla.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_script"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_script\script_edit.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_script\script_header.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_script\script_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_script\script_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_script\space_script.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_sequencer"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_sequencer\sequencer_add.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_sequencer\sequencer_buttons.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_sequencer\sequencer_draw.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_sequencer\sequencer_edit.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_sequencer\sequencer_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_sequencer\sequencer_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_sequencer\sequencer_scopes.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_sequencer\sequencer_select.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_sequencer\space_sequencer.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_text"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_text\space_text.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_text\text_draw.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_text\text_header.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_text\text_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_text\text_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_text\text_python.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_sound"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_sound\sound_header.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_sound\sound_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_sound\space_sound.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="animation"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\animation\anim_channels.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\animation\anim_deps.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\animation\anim_draw.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\animation\anim_filter.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\animation\anim_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\animation\anim_ipo_utils.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\animation\anim_markers.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\animation\anim_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\animation\drivers.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\animation\fmodifier_ui.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\animation\keyframes_draw.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\animation\keyframes_edit.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\animation\keyframes_general.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\animation\keyframing.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\animation\keyingsets.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="object"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\object\editconstraint.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\object\editgroup.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\object\editkey.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\object\editlattice.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\object\object_edit.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\object\object_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\object\object_modifier.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\object\object_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\object\object_vgroup.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="transform"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\transform\transform.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\transform\transform.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\transform\transform_constraints.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\transform\transform_conversions.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\transform\transform_generics.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\transform\transform_input.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\transform\transform_manipulator.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\transform\transform_ndofinput.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\transform\transform_numinput.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\transform\transform_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\transform\transform_orientations.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\transform\transform_snap.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="mesh"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\mesh\editface.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\mesh\editmesh.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\mesh\editmesh_add.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\mesh\editmesh_lib.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\mesh\editmesh_loop.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\mesh\editmesh_mods.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\mesh\editmesh_tools.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\mesh\mesh_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\mesh\mesh_layers.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\mesh\mesh_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\mesh\meshtools.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="armature"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\armature\armature_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\armature\armature_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\armature\BIF_generate.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\armature\BIF_retarget.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\armature\editarmature.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\armature\editarmature_generate.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\armature\editarmature_retarget.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\armature\editarmature_sketch.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\armature\meshlaplacian.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\armature\meshlaplacian.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\armature\poselib.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\armature\poseobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\armature\reeb.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\armature\reeb.h"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="sculpt_paint"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\sculpt_paint\paint_image.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\sculpt_paint\paint_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\sculpt_paint\paint_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\sculpt_paint\paint_utils.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\sculpt_paint\paint_vertex.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\sculpt_paint\sculpt.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\sculpt_paint\sculpt_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\sculpt_paint\sculpt_stroke.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="uvedit"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\uvedit\uvedit_draw.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\uvedit\uvedit_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\uvedit\uvedit_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\uvedit\uvedit_parametrizer.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\uvedit\uvedit_parametrizer.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\uvedit\uvedit_unwrap_ops.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="gpencil"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\gpencil\drawgpencil.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\gpencil\editaction_gpencil.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\gpencil\gpencil_edit.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\gpencil\gpencil_intern.h"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="curve"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\curve\curve_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\curve\curve_ops.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\curve\editcurve.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\curve\editfont.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\curve\lorem.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="preview"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\preview\previewrender.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\preview\previewrender_intern.h"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="physics"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\physics\ed_fluidsim.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\physics\ed_pointcache.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\physics\editparticle.c"\r
 +                              >\r
 +                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\physics\physics_boids.c"\r
++                              >\r
++                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\physics\physics_intern.h"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="space_logic"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_logic\logic_buttons.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_logic\logic_header.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_logic\logic_intern.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_logic\logic_window.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\editors\space_logic\space_logic.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
++              <Filter\r
++                      Name="space_console"\r
++                      >\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\space_console\console_draw.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\space_console\console_intern.h"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\space_console\console_ops.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\space_console\console_report.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\space_console\space_console.c"\r
++                              >\r
++                      </File>\r
++              </Filter>\r
 +      </Files>\r
 +      <Globals>\r
 +      </Globals>\r
 +</VisualStudioProject>\r
@@@ -43,8 -42,8 +43,8 @@@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
--                              AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\zlib\include;..\..\..\source\blender\inflate;..\..\..\source\blender\deflate;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\streamglue;..\..\..\source\blender\readblenfile;..\..\..\source\blender\writeblenfile;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\writestreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel\gen_messaging;..\..\..\..\build\msvc_9\extern\verse\include"\r
 -                              PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_VERSE"\r
++                              AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\zlib\include;..\..\..\source\blender\inflate;..\..\..\source\blender\deflate;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\streamglue;..\..\..\source\blender\readblenfile;..\..\..\source\blender\writeblenfile;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\writestreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel\gen_messaging;..\..\..\..\build\msvc_9\extern\verse\include"\r
 +                              PreprocessorDefinitions="_DEBUG;WIN32;_LIB"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                DefaultCharIsUnsigned="true"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                InlineFunctionExpansion="1"\r
--                              AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\zlib\include;..\..\..\source\blender\inflate;..\..\..\source\blender\deflate;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\streamglue;..\..\..\source\blender\readblenfile;..\..\..\source\blender\writeblenfile;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\writestreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel\gen_messaging;..\..\..\..\build\msvc_9\extern\verse\include"\r
 -                              PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_VERSE"\r
++                              AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\zlib\include;..\..\..\source\blender\inflate;..\..\..\source\blender\deflate;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesrna;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\streamglue;..\..\..\source\blender\readblenfile;..\..\..\source\blender\writeblenfile;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\writestreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel\gen_messaging;..\..\..\..\build\msvc_9\extern\verse\include"\r
 +                              PreprocessorDefinitions="NDEBUG;WIN32;_LIB"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                RelativePath="..\..\..\source\blender\makesdna\DNA_armature_types.h"\r
                                >\r
                        </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\makesdna\DNA_boid_types.h"\r
++                              >\r
++                      </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\makesdna\DNA_brush_types.h"\r
                                >\r
                                RelativePath="..\..\..\source\blender\makesdna\DNA_script_types.h"\r
                                >\r
                        </File>\r
--                      <File\r
--                              RelativePath="..\..\..\source\blender\makesdna\DNA_scriptlink_types.h"\r
--                              >\r
--                      </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\makesdna\DNA_sdna_types.h"\r
                                >\r
index 9e4c50e,0000000..3db2921
mode 100644,000000..100644
--- /dev/null
@@@ -1,839 -1,0 +1,843 @@@
-                               AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\windowmanager"\r
 +<?xml version="1.0" encoding="Windows-1252"?>\r
 +<VisualStudioProject\r
 +      ProjectType="Visual C++"\r
 +      Version="9,00"\r
 +      Name="RNA_makesrna"\r
 +      ProjectGUID="{8C2BCCF8-4D9E-46D3-BABF-C1545A332CE6}"\r
 +      RootNamespace="DNA_makesdna"\r
 +      TargetFrameworkVersion="131072"\r
 +      >\r
 +      <Platforms>\r
 +              <Platform\r
 +                      Name="Win32"\r
 +              />\r
 +      </Platforms>\r
 +      <ToolFiles>\r
 +      </ToolFiles>\r
 +      <Configurations>\r
 +              <Configuration\r
 +                      Name="3D Plugin Debug|Win32"\r
 +                      OutputDirectory="..\..\..\..\build\msvc_9\source\blender\makesdna\mtdll\debug"\r
 +                      IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna\mtdll\debug"\r
 +                      ConfigurationType="1"\r
 +                      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      CharacterSet="2"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                              CommandLine="DEL ..\..\..\source\blender\makesrna\intern\*_gen.c"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXMLDataGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCWebServiceProxyGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCMIDLTool"\r
 +                              TypeLibraryName=".\..\..\..\source\blender\makesdna\intern/DNA_makesrna.tlb"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCLCompilerTool"\r
 +                              Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\windowmanager"\r
++                              AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager"\r
 +                              PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"\r
 +                              BasicRuntimeChecks="3"\r
 +                              RuntimeLibrary="3"\r
 +                              DefaultCharIsUnsigned="true"\r
 +                              UsePrecompiledHeader="0"\r
 +                              PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\makesdna\mtdll\debug\DNA_makesrna.pch"\r
 +                              AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\makesdna\mtdll\debug\"\r
 +                              ObjectFile="..\..\..\..\build\msvc_9\source\blender\makesrna\mtdll\debug\"\r
 +                              ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\makesrna\mtdll\debug\"\r
 +                              WarningLevel="2"\r
 +                              SuppressStartupBanner="true"\r
 +                              DebugInformationFormat="3"\r
 +                              CompileAs="0"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManagedResourceCompilerTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCResourceCompilerTool"\r
 +                              PreprocessorDefinitions="_DEBUG"\r
 +                              Culture="1033"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPreLinkEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCLinkerTool"\r
 +                              AdditionalOptions="/MACHINE:I386"\r
 +                              AdditionalDependencies="libguardedalloc.lib BLI_blenlib.lib odbc32.lib odbccp32.lib"\r
 +                              OutputFile="..\..\..\source\blender\makesrna\intern\RNA_makesrna.exe"\r
 +                              LinkIncremental="2"\r
 +                              SuppressStartupBanner="true"\r
 +                              AdditionalLibraryDirectories="..\..\..\..\build\msvc_9\libs\intern\mtdll\debug;..\..\..\..\build\msvc_9\libs\mtdll\debug"\r
 +                              IgnoreDefaultLibraryNames=" libc.lib, libcmt.lib, msvcrt.lib, libcd.lib, libcmtd.lib"\r
 +                              GenerateDebugInformation="true"\r
 +                              ProgramDatabaseFile="..\..\..\..\build\msvc_9\libs\debug\DNA_makesrna.pdb"\r
 +                              SubSystem="1"\r
 +                              RandomizedBaseAddress="1"\r
 +                              DataExecutionPrevention="0"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCALinkTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManifestTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXDCMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCBscMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCFxCopTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCAppVerifierTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPostBuildEventTool"\r
 +                              Description="Building RNA"\r
 +                              CommandLine="CD ..\..\..\source\blender\makesrna\intern&#x0D;&#x0A;RNA_makesrna.exe rna.c&#x0D;&#x0A;"\r
 +                      />\r
 +              </Configuration>\r
 +              <Configuration\r
 +                      Name="Blender Release|Win32"\r
 +                      OutputDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna"\r
 +                      IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna"\r
 +                      ConfigurationType="1"\r
 +                      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      CharacterSet="2"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                              CommandLine="DEL ..\..\..\source\blender\makesrna\intern\*_gen.c"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXMLDataGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCWebServiceProxyGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCMIDLTool"\r
 +                              TypeLibraryName=".\..\..\..\source\blender\makesrna\intern/DNA_makesrna.tlb"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCLCompilerTool"\r
 +                              InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\windowmanager"\r
++                              AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager"\r
 +                              PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"\r
 +                              StringPooling="true"\r
 +                              RuntimeLibrary="0"\r
 +                              EnableFunctionLevelLinking="true"\r
 +                              DefaultCharIsUnsigned="true"\r
 +                              UsePrecompiledHeader="0"\r
 +                              PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\makesrna\DNA_makesrna.pch"\r
 +                              AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\makesrna\"\r
 +                              ObjectFile="..\..\..\..\build\msvc_9\source\blender\makesrna\"\r
 +                              ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\makesrna\"\r
 +                              WarningLevel="2"\r
 +                              SuppressStartupBanner="true"\r
 +                              CompileAs="0"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManagedResourceCompilerTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCResourceCompilerTool"\r
 +                              PreprocessorDefinitions="NDEBUG"\r
 +                              Culture="1033"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPreLinkEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCLinkerTool"\r
 +                              AdditionalOptions="/MACHINE:I386"\r
 +                              AdditionalDependencies="libguardedalloc.lib BLI_blenlib.lib"\r
 +                              OutputFile="..\..\..\source\blender\makesrna\intern\RNA_makesrna.exe"\r
 +                              LinkIncremental="1"\r
 +                              SuppressStartupBanner="true"\r
 +                              AdditionalLibraryDirectories="..\..\..\..\build\msvc_9\libs\intern;..\..\..\..\build\msvc_9\libs"\r
 +                              IgnoreDefaultLibraryNames="libc.lib"\r
 +                              ProgramDatabaseFile="..\..\..\..\build\msvc_9\libs\DNA_makesrna.pdb"\r
 +                              SubSystem="1"\r
 +                              RandomizedBaseAddress="1"\r
 +                              DataExecutionPrevention="0"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCALinkTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManifestTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXDCMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCBscMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCFxCopTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCAppVerifierTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPostBuildEventTool"\r
 +                              Description="Building RNA"\r
 +                              CommandLine="CD ..\..\..\source\blender\makesrna\intern\&#x0D;&#x0A;RNA_makesrna.exe .\&#x0D;&#x0A;"\r
 +                      />\r
 +              </Configuration>\r
 +              <Configuration\r
 +                      Name="3D Plugin Release|Win32"\r
 +                      OutputDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna\mtdll"\r
 +                      IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna\mtdll"\r
 +                      ConfigurationType="1"\r
 +                      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      CharacterSet="2"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                              CommandLine="DEL ..\..\..\source\blender\makesrna\intern\*_gen.c"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXMLDataGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCWebServiceProxyGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCMIDLTool"\r
 +                              TypeLibraryName=".\..\..\..\source\blender\makesrna\intern/DNA_makesrna.tlb"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCLCompilerTool"\r
 +                              InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\windowmanager"\r
++                              AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager"\r
 +                              PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"\r
 +                              StringPooling="true"\r
 +                              RuntimeLibrary="2"\r
 +                              EnableFunctionLevelLinking="true"\r
 +                              DefaultCharIsUnsigned="true"\r
 +                              UsePrecompiledHeader="0"\r
 +                              PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\makesrna\mtdll\DNA_makesrna.pch"\r
 +                              AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\makesrna\mtdll\"\r
 +                              ObjectFile="..\..\..\..\build\msvc_9\source\blender\makesrna\mtdll\"\r
 +                              ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\makesrna\mtdll\"\r
 +                              WarningLevel="2"\r
 +                              SuppressStartupBanner="true"\r
 +                              CompileAs="0"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManagedResourceCompilerTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCResourceCompilerTool"\r
 +                              PreprocessorDefinitions="NDEBUG"\r
 +                              Culture="1033"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPreLinkEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCLinkerTool"\r
 +                              AdditionalOptions="/MACHINE:I386"\r
 +                              AdditionalDependencies="libguardedalloc.lib BLI_blenlib.lib odbc32.lib odbccp32.lib"\r
 +                              OutputFile="..\..\..\source\blender\makesrna\intern\RNA_makesrna.exe"\r
 +                              LinkIncremental="1"\r
 +                              SuppressStartupBanner="true"\r
 +                              AdditionalLibraryDirectories="..\..\..\..\build\msvc_9\libs\intern\mtdll;..\..\..\..\build\msvc_9\libs\mtdll"\r
 +                              IgnoreDefaultLibraryNames=" libc.lib, libcmt.lib, libcd.lib, libcmtd.lib, msvcrtd.lib"\r
 +                              ProgramDatabaseFile="..\..\..\..\build\msvc_9\libs\DNA_makesrna.pdb"\r
 +                              SubSystem="1"\r
 +                              RandomizedBaseAddress="1"\r
 +                              DataExecutionPrevention="0"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCALinkTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManifestTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXDCMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCBscMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCFxCopTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCAppVerifierTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPostBuildEventTool"\r
 +                              Description="Building RNA"\r
 +                              CommandLine="CD ..\..\..\source\blender\makesrna\intern&#x0D;&#x0A;RNA_makesrna.exe rna.c&#x0D;&#x0A;"\r
 +                      />\r
 +              </Configuration>\r
 +              <Configuration\r
 +                      Name="Blender Debug|Win32"\r
 +                      OutputDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna\debug"\r
 +                      IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna\debug"\r
 +                      ConfigurationType="1"\r
 +                      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      CharacterSet="2"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                              CommandLine="del ..\..\..\source\blender\makesrna\intern\rna_*_gen.c"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXMLDataGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCWebServiceProxyGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCMIDLTool"\r
 +                              TypeLibraryName=".\..\..\..\source\blender\makesrna\intern/DNA_makesrna.tlb"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCLCompilerTool"\r
 +                              Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\windowmanager"\r
++                              AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager"\r
 +                              PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE"\r
 +                              BasicRuntimeChecks="3"\r
 +                              RuntimeLibrary="1"\r
 +                              DefaultCharIsUnsigned="true"\r
 +                              UsePrecompiledHeader="0"\r
 +                              PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\makesrna\debug\DNA_makesrna.pch"\r
 +                              ExpandAttributedSource="false"\r
 +                              AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\makesrna\debug\"\r
 +                              ObjectFile="..\..\..\..\build\msvc_9\source\blender\makesrna\debug\"\r
 +                              ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\makesrna\debug\"\r
 +                              WarningLevel="2"\r
 +                              SuppressStartupBanner="true"\r
 +                              DebugInformationFormat="3"\r
 +                              CompileAs="0"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManagedResourceCompilerTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCResourceCompilerTool"\r
 +                              PreprocessorDefinitions="_DEBUG"\r
 +                              Culture="1033"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPreLinkEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCLinkerTool"\r
 +                              AdditionalOptions="/MACHINE:I386&#x0D;&#x0A;"\r
 +                              AdditionalDependencies="libguardedalloc.lib BLI_blenlib.lib DNA_dna.lib"\r
 +                              OutputFile="..\..\..\source\blender\makesrna\intern\RNA_makesrna.exe"\r
 +                              LinkIncremental="2"\r
 +                              SuppressStartupBanner="true"\r
 +                              AdditionalLibraryDirectories="..\..\..\..\build\msvc_9\libs\intern\debug;..\..\..\..\build\msvc_9\libs\debug"\r
 +                              IgnoreAllDefaultLibraries="false"\r
 +                              IgnoreDefaultLibraryNames="libc.lib, libcd.lib"\r
 +                              GenerateDebugInformation="true"\r
 +                              ProgramDatabaseFile="..\..\..\..\build\msvc_9\libs\debug\DNA_makesrna.pdb"\r
 +                              SubSystem="1"\r
 +                              RandomizedBaseAddress="1"\r
 +                              DataExecutionPrevention="0"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCALinkTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManifestTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXDCMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCBscMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCFxCopTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCAppVerifierTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPostBuildEventTool"\r
 +                              Description="Building RNA"\r
 +                              CommandLine="CD ..\..\..\source\blender\makesrna\intern\&#x0D;&#x0A;RNA_makesrna.exe .\&#x0D;&#x0A;"\r
 +                      />\r
 +              </Configuration>\r
 +              <Configuration\r
 +                      Name="BlenderPlayer Debug|Win32"\r
 +                      OutputDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna\debug\blenplayer"\r
 +                      IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna\debug\blenplayer"\r
 +                      ConfigurationType="1"\r
 +                      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      CharacterSet="2"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                              CommandLine="DEL ..\..\..\source\blender\makesrna\intern\*_gen.c"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXMLDataGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCWebServiceProxyGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCMIDLTool"\r
 +                              TypeLibraryName=".\..\..\..\source\blender\makesrna\intern/DNA_makesrna.tlb"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCLCompilerTool"\r
 +                              Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\windowmanager"\r
++                              AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager"\r
 +                              PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"\r
 +                              BasicRuntimeChecks="3"\r
 +                              RuntimeLibrary="1"\r
 +                              DefaultCharIsUnsigned="true"\r
 +                              UsePrecompiledHeader="0"\r
 +                              PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\makesrna\debug\DNA_makesrna.pch"\r
 +                              ExpandAttributedSource="false"\r
 +                              AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\makesrna\debug\"\r
 +                              ObjectFile="..\..\..\..\build\msvc_9\source\blender\makesrna\debug\"\r
 +                              ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\makesrna\debug\"\r
 +                              WarningLevel="2"\r
 +                              SuppressStartupBanner="true"\r
 +                              DebugInformationFormat="3"\r
 +                              CompileAs="0"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManagedResourceCompilerTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCResourceCompilerTool"\r
 +                              PreprocessorDefinitions="_DEBUG"\r
 +                              Culture="1033"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPreLinkEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCLinkerTool"\r
 +                              AdditionalOptions="/MACHINE:I386&#x0D;&#x0A;"\r
 +                              AdditionalDependencies="libguardedalloc.lib BLI_blenlib.lib odbc32.lib odbccp32.lib"\r
 +                              OutputFile="..\..\..\source\blender\makesrna\intern\RNA_makesrna.exe"\r
 +                              LinkIncremental="2"\r
 +                              SuppressStartupBanner="true"\r
 +                              AdditionalLibraryDirectories="..\..\..\..\build\msvc_9\libs\intern\debug;..\..\..\..\build\msvc_9\libs\debug"\r
 +                              IgnoreAllDefaultLibraries="false"\r
 +                              IgnoreDefaultLibraryNames="libc.lib, libcd.lib"\r
 +                              GenerateDebugInformation="true"\r
 +                              ProgramDatabaseFile="..\..\..\..\build\msvc_9\libs\debug\DNA_makesrna.pdb"\r
 +                              SubSystem="1"\r
 +                              RandomizedBaseAddress="1"\r
 +                              DataExecutionPrevention="0"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCALinkTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManifestTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXDCMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCBscMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCFxCopTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCAppVerifierTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPostBuildEventTool"\r
 +                              Description="Building RNA"\r
 +                              CommandLine="CD ..\..\..\source\blender\makesrna\intern\&#x0D;&#x0A;RNA_makesrna.exe .\&#x0D;&#x0A;"\r
 +                      />\r
 +              </Configuration>\r
 +              <Configuration\r
 +                      Name="BlenderPlayer Release|Win32"\r
 +                      OutputDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna\blenplayer"\r
 +                      IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna\blenplayer"\r
 +                      ConfigurationType="1"\r
 +                      InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      CharacterSet="2"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                              CommandLine=""\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXMLDataGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCWebServiceProxyGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCMIDLTool"\r
 +                              TypeLibraryName=".\..\..\..\source\blender\makesrna\intern/DNA_makesrna.tlb"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCLCompilerTool"\r
 +                              InlineFunctionExpansion="1"\r
-                               RelativePath="..\..\..\source\blender\makesrna\intern\rna_scriptlink.c"\r
++                              AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager"\r
 +                              PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"\r
 +                              StringPooling="true"\r
 +                              RuntimeLibrary="0"\r
 +                              EnableFunctionLevelLinking="true"\r
 +                              DefaultCharIsUnsigned="true"\r
 +                              UsePrecompiledHeader="0"\r
 +                              PrecompiledHeaderFile="..\..\..\..\build\msvc_9\source\blender\makesrna\DNA_makesrna.pch"\r
 +                              AssemblerListingLocation="..\..\..\..\build\msvc_9\source\blender\makesrna\"\r
 +                              ObjectFile="..\..\..\..\build\msvc_9\source\blender\makesrna\"\r
 +                              ProgramDataBaseFileName="..\..\..\..\build\msvc_9\source\blender\makesrna\"\r
 +                              WarningLevel="2"\r
 +                              SuppressStartupBanner="true"\r
 +                              CompileAs="0"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManagedResourceCompilerTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCResourceCompilerTool"\r
 +                              PreprocessorDefinitions="NDEBUG"\r
 +                              Culture="1033"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPreLinkEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCLinkerTool"\r
 +                              AdditionalOptions="/MACHINE:I386"\r
 +                              AdditionalDependencies="libguardedalloc.lib BLI_blenlib.lib odbc32.lib odbccp32.lib"\r
 +                              OutputFile="..\..\..\source\blender\makesrna\intern\RNA_makesrna.exe"\r
 +                              LinkIncremental="1"\r
 +                              SuppressStartupBanner="true"\r
 +                              AdditionalLibraryDirectories="..\..\..\..\build\msvc_9\libs\intern;..\..\..\..\build\msvc_9\libs"\r
 +                              IgnoreDefaultLibraryNames="libc.lib"\r
 +                              ProgramDatabaseFile="..\..\..\..\build\msvc_9\libs\DNA_makesrna.pdb"\r
 +                              SubSystem="1"\r
 +                              RandomizedBaseAddress="1"\r
 +                              DataExecutionPrevention="0"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCALinkTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManifestTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXDCMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCBscMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCFxCopTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCAppVerifierTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPostBuildEventTool"\r
 +                              Description="Building RNA"\r
 +                              CommandLine="CD ..\..\..\source\blender\makesrna\intern\&#x0D;&#x0A;RNA_makesrna.exe .\&#x0D;&#x0A;"\r
 +                      />\r
 +              </Configuration>\r
 +      </Configurations>\r
 +      <References>\r
 +      </References>\r
 +      <Files>\r
 +              <Filter\r
 +                      Name="Source Files"\r
 +                      Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\makesrna.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_action.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_actuator.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_animation.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_armature.c"\r
 +                              >\r
 +                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_boid.c"\r
++                              >\r
++                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_brush.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_camera.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_cloth.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_color.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_constraint.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_context.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_controller.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_curve.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_define.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_fcurve.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_fluidsim.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_group.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_ID.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_image.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_key.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_lamp.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_lattice.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_main.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_main_api.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_material.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_mesh.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_mesh_api.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_meta.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_modifier.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_nla.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_nodetree.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_object.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_object_api.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_object_force.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_packedfile.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_particle.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_pose.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_property.c"\r
 +                              >\r
 +                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_render.c"\r
++                              >\r
++                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_rna.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_scene.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_screen.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
-                       <File\r
-                               RelativePath="..\..\..\source\blender\makesrna\intern\rna_vpaint.c"\r
-                               >\r
-                       </File>\r
++                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_sculpt_paint.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_sensor.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_sequence.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_sound.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_space.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_text.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_texture.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_timeline.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_ui.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_ui_api.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_userdef.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_vfont.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_wm.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_wm_api.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\..\..\source\blender\makesrna\intern\rna_world.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="Header Files"\r
 +                      Filter="h;hpp;hxx;hm;inl"\r
 +                      >\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="Resource Files"\r
 +                      Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
 +                      >\r
 +              </Filter>\r
 +      </Files>\r
 +      <Globals>\r
 +      </Globals>\r
 +</VisualStudioProject>\r
index f6eb7b2,0000000..0699468
mode 100644,000000..100644
--- /dev/null
@@@ -1,401 -1,0 +1,405 @@@
-                               AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include"\r
 +<?xml version="1.0" encoding="Windows-1252"?>\r
 +<VisualStudioProject\r
 +      ProjectType="Visual C++"\r
 +      Version="9,00"\r
 +      Name="RNA_rna"\r
 +      ProjectGUID="{DFE7F3E3-E62A-4677-B666-DF0DDF70C359}"\r
 +      RootNamespace="RNA_rna"\r
 +      Keyword="Win32Proj"\r
 +      TargetFrameworkVersion="196613"\r
 +      >\r
 +      <Platforms>\r
 +              <Platform\r
 +                      Name="Win32"\r
 +              />\r
 +      </Platforms>\r
 +      <ToolFiles>\r
 +      </ToolFiles>\r
 +      <Configurations>\r
 +              <Configuration\r
 +                      Name="Blender Debug|Win32"\r
 +                      OutputDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna\debug"\r
 +                      IntermediateDirectory="..\..\..\..\build\msvc_9\source\blender\makesrna\debug"\r
 +                      ConfigurationType="4"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      CharacterSet="2"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                 &nbs