Revision: 21836
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21836
Author: yukishiro
Date: 2009-07-24 05:08:09 +0200 (Fri, 24 Jul 2009)
Log Message:
-----------
merge till 21835. still need to fix lightenv preview
Modified Paths:
--------------
branches/soc-2009-yukishiro/CMakeLists.txt
branches/soc-2009-yukishiro/config/linux2-config.py
branches/soc-2009-yukishiro/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.sln
branches/soc-2009-yukishiro/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2009-yukishiro/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2009-yukishiro/projectfiles_vc9/blender/loader/BLO_loader.vcproj
branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesdna/DNA_makesdna.vcproj
branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/soc-2009-yukishiro/projectfiles_vc9/blender/nodes/nodes.vcproj
branches/soc-2009-yukishiro/projectfiles_vc9/blender/render/BRE_render.vcproj
branches/soc-2009-yukishiro/release/datafiles/blenderbuttons
branches/soc-2009-yukishiro/release/ui/buttons_data_armature.py
branches/soc-2009-yukishiro/release/ui/buttons_data_bone.py
branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py
branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py
branches/soc-2009-yukishiro/release/ui/buttons_material.py
branches/soc-2009-yukishiro/release/ui/buttons_objects.py
branches/soc-2009-yukishiro/release/ui/buttons_particle.py
branches/soc-2009-yukishiro/release/ui/buttons_physics_cloth.py
branches/soc-2009-yukishiro/release/ui/buttons_physics_field.py
branches/soc-2009-yukishiro/release/ui/buttons_physics_fluid.py
branches/soc-2009-yukishiro/release/ui/buttons_physics_softbody.py
branches/soc-2009-yukishiro/release/ui/buttons_scene.py
branches/soc-2009-yukishiro/release/ui/buttons_texture.py
branches/soc-2009-yukishiro/release/ui/buttons_world.py
branches/soc-2009-yukishiro/release/ui/space_console.py
branches/soc-2009-yukishiro/release/ui/space_image.py
branches/soc-2009-yukishiro/release/ui/space_info.py
branches/soc-2009-yukishiro/release/ui/space_logic.py
branches/soc-2009-yukishiro/release/ui/space_view3d.py
branches/soc-2009-yukishiro/release/ui/space_view3d_toolbar.py
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_action.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_object.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_particle.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_property.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_screen.h
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/action.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/armature.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/blender.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/effect.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/exotic.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/fluidsim.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/lightenv.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/material.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/modifier.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/object.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/particle.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/particle_system.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/pointcache.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/property.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/scene.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/screen.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/texture.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/world.c
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_arithb.h
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_kdtree.h
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_util.h
branches/soc-2009-yukishiro/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2009-yukishiro/source/blender/blenlib/intern/arithb.c
branches/soc-2009-yukishiro/source/blender/blenlib/intern/util.c
branches/soc-2009-yukishiro/source/blender/blenloader/CMakeLists.txt
branches/soc-2009-yukishiro/source/blender/blenloader/SConscript
branches/soc-2009-yukishiro/source/blender/blenloader/intern/Makefile
branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/writefile.c
branches/soc-2009-yukishiro/source/blender/editors/animation/keyingsets.c
branches/soc-2009-yukishiro/source/blender/editors/armature/armature_intern.h
branches/soc-2009-yukishiro/source/blender/editors/armature/armature_ops.c
branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature.c
branches/soc-2009-yukishiro/source/blender/editors/armature/poseobject.c
branches/soc-2009-yukishiro/source/blender/editors/curve/curve_intern.h
branches/soc-2009-yukishiro/source/blender/editors/curve/curve_ops.c
branches/soc-2009-yukishiro/source/blender/editors/curve/editcurve.c
branches/soc-2009-yukishiro/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2009-yukishiro/source/blender/editors/include/ED_physics.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_previewrender.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_screen.h
branches/soc-2009-yukishiro/source/blender/editors/include/UI_icons.h
branches/soc-2009-yukishiro/source/blender/editors/include/UI_interface.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_draw.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_intern.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_layout.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_panel.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_regions.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_style.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_templates.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_utils.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_add.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/mesh_intern.h
branches/soc-2009-yukishiro/source/blender/editors/mesh/mesh_ops.c
branches/soc-2009-yukishiro/source/blender/editors/object/editconstraint.c
branches/soc-2009-yukishiro/source/blender/editors/object/object_edit.c
branches/soc-2009-yukishiro/source/blender/editors/object/object_intern.h
branches/soc-2009-yukishiro/source/blender/editors/object/object_ops.c
branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
branches/soc-2009-yukishiro/source/blender/editors/screen/area.c
branches/soc-2009-yukishiro/source/blender/editors/screen/screen_context.c
branches/soc-2009-yukishiro/source/blender/editors/screen/screen_edit.c
branches/soc-2009-yukishiro/source/blender/editors/screen/screen_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_api/spacetypes.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_logic/logic_window.c
branches/soc-2009-yukishiro/source/blender/editors/space_node/space_node.c
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner.c
branches/soc-2009-yukishiro/source/blender/editors/space_text/text_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_time/time_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform.h
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_ops.c
branches/soc-2009-yukishiro/source/blender/gpu/intern/gpu_draw.c
branches/soc-2009-yukishiro/source/blender/imbuf/IMB_imbuf.h
branches/soc-2009-yukishiro/source/blender/imbuf/intern/filter.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_camera_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_lightenv_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_material_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_object_force.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_object_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_particle_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_property_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scene_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_screen_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_space_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_texture_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_world_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/intern/makesdna.c
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_access.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_define.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_enum_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/SConscript
branches/soc-2009-yukishiro/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2009-yukishiro/source/blender/makesrna/intern/Makefile
branches/soc-2009-yukishiro/source/blender/makesrna/intern/SConscript
branches/soc-2009-yukishiro/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_armature.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_brush.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_internal.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_material.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_particle.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_pose.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_property.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_texture.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ui.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_world.c
branches/soc-2009-yukishiro/source/blender/nodes/CMakeLists.txt
branches/soc-2009-yukishiro/source/blender/nodes/SConscript
branches/soc-2009-yukishiro/source/blender/nodes/intern/CMP_nodes/Makefile
branches/soc-2009-yukishiro/source/blender/nodes/intern/Makefile
branches/soc-2009-yukishiro/source/blender/nodes/intern/SHD_nodes/Makefile
branches/soc-2009-yukishiro/source/blender/nodes/intern/TEX_nodes/Makefile
branches/soc-2009-yukishiro/source/blender/python/BPY_extern.h
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_interface.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.h
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_ui.c
branches/soc-2009-yukishiro/source/blender/python/intern/stubs.c
branches/soc-2009-yukishiro/source/blender/render/CMakeLists.txt
branches/soc-2009-yukishiro/source/blender/render/SConscript
branches/soc-2009-yukishiro/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2009-yukishiro/source/blender/render/intern/source/Makefile
branches/soc-2009-yukishiro/source/blender/render/intern/source/convertblender.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/imagetexture.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/occlusion.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/pipeline.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/shadeinput.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/texture.c
branches/soc-2009-yukishiro/source/blender/windowmanager/WM_api.h
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_files.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-yukishiro/source/blender/windowmanager/wm_event_types.h
branches/soc-2009-yukishiro/source/creator/CMakeLists.txt
branches/soc-2009-yukishiro/source/creator/creator.c
branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2009-yukishiro/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2009-yukishiro/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
Added Paths:
-----------
branches/soc-2009-yukishiro/release/ui/buttons_game.py
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_boids.h
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/boids.c
branches/soc-2009-yukishiro/source/blender/editors/physics/physics_boids.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_boid_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_boid.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_render.c
Removed Paths:
-------------
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scriptlink_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_scriptlink.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_scriptlink.c
Modified: branches/soc-2009-yukishiro/CMakeLists.txt
===================================================================
--- branches/soc-2009-yukishiro/CMakeLists.txt 2009-07-24 01:55:58 UTC (rev
21835)
+++ branches/soc-2009-yukishiro/CMakeLists.txt 2009-07-24 03:08:09 UTC (rev
21836)
@@ -338,17 +338,29 @@
ENDIF(OPENAL_FOUND)
ENDIF(WITH_OPENAL)
- 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 "")
- 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_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")
Modified: branches/soc-2009-yukishiro/config/linux2-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/linux2-config.py 2009-07-24 01:55:58 UTC
(rev 21835)
+++ branches/soc-2009-yukishiro/config/linux2-config.py 2009-07-24 03:08:09 UTC
(rev 21836)
@@ -1,17 +1,9 @@
LCGDIR = '../lib/linux2'
LIBDIR = "${LCGDIR}"
-def py_version_string():
- '''
- returns py version - "2.5", "2.6" etc
- '''
- import platform
- ver = platform.python_version_tuple()
- return '%d.%d' % (int(ver[0]), int(ver[1])) # py2.5 uses strings, 2.6
ints
-
BF_PYTHON = '/usr'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = py_version_string()
+BF_PYTHON_VERSION = '3.1'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
Modified:
branches/soc-2009-yukishiro/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
===================================================================
---
branches/soc-2009-yukishiro/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
2009-07-24 01:55:58 UTC (rev 21835)
+++
branches/soc-2009-yukishiro/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
2009-07-24 03:08:09 UTC (rev 21836)
@@ -351,10 +351,6 @@
>
</File>
<File
-
RelativePath="..\..\..\source\blender\python\intern\bpy_scriptlink.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\python\intern\bpy_ui.c"
>
</File>
Modified: branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.sln
===================================================================
--- branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.sln
2009-07-24 01:55:58 UTC (rev 21835)
+++ branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.sln
2009-07-24 03:08:09 UTC (rev 21836)
@@ -207,6 +207,10 @@
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BL_nodes",
"nodes\nodes.vcproj", "{4C3AB78A-52CA-4276-A041-39776E52D8C8}"
+ ProjectSection(ProjectDependencies) = postProject
+ {7495FE37-933A-4AC1-BB2A-B3FDB4DE4284} =
{7495FE37-933A-4AC1-BB2A-B3FDB4DE4284}
+ {DFE7F3E3-E62A-4677-B666-DF0DDF70C359} =
{DFE7F3E3-E62A-4677-B666-DF0DDF70C359}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BL_gpu",
"gpu\BL_gpu.vcproj", "{138DD16C-CC78-4F6C-A898-C8DA68D89067}"
EndProject
Modified:
branches/soc-2009-yukishiro/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
===================================================================
---
branches/soc-2009-yukishiro/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
2009-07-24 01:55:58 UTC (rev 21835)
+++
branches/soc-2009-yukishiro/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
2009-07-24 03:08:09 UTC (rev 21836)
@@ -522,6 +522,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\blenkernel\intern\boids.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenkernel\intern\booleanops.c"
>
</File>
@@ -831,6 +835,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\blenkernel\BKE_boids.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenkernel\BKE_booleanops.h"
>
</File>
Modified:
branches/soc-2009-yukishiro/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
===================================================================
---
branches/soc-2009-yukishiro/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
2009-07-24 01:55:58 UTC (rev 21835)
+++
branches/soc-2009-yukishiro/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
2009-07-24 03:08:09 UTC (rev 21836)
@@ -523,6 +523,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\blenlib\intern\DLRB_tree.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\intern\dynamiclist.c"
>
</File>
@@ -640,6 +644,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\blenlib\BLI_dlrbTree.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\BLI_dynamiclist.h"
>
</File>
Modified:
branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
---
branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-07-24 01:55:58 UTC (rev 21835)
+++
branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-07-24 03:08:09 UTC (rev 21836)
@@ -1387,6 +1387,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\physics\physics_boids.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\physics\physics_intern.h"
>
</File>
@@ -1415,6 +1419,30 @@
>
</File>
</Filter>
+ <Filter
+ Name="space_console"
+ >
+ <File
+
RelativePath="..\..\..\source\blender\editors\space_console\console_draw.c"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\editors\space_console\console_intern.h"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\editors\space_console\console_ops.c"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\editors\space_console\console_report.c"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\editors\space_console\space_console.c"
+ >
+ </File>
+ </Filter>
</Files>
<Globals>
</Globals>
Modified:
branches/soc-2009-yukishiro/projectfiles_vc9/blender/loader/BLO_loader.vcproj
===================================================================
---
branches/soc-2009-yukishiro/projectfiles_vc9/blender/loader/BLO_loader.vcproj
2009-07-24 01:55:58 UTC (rev 21835)
+++
branches/soc-2009-yukishiro/projectfiles_vc9/blender/loader/BLO_loader.vcproj
2009-07-24 03:08:09 UTC (rev 21836)
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
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"
+
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"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -268,7 +268,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
