Revision: 21623
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21623
Author: kazanbas
Date: 2009-07-16 11:09:38 +0200 (Thu, 16 Jul 2009)
Log Message:
-----------
Merge with 2.5 -r 21515:21619.
Modified Paths:
--------------
branches/soc-2009-kazanbas/config/win32-mingw-config.py
branches/soc-2009-kazanbas/config/win32-vc-config.py
branches/soc-2009-kazanbas/config/win64-vc-config.py
branches/soc-2009-kazanbas/projectfiles_vc9/blender/blender.vcproj
branches/soc-2009-kazanbas/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2009-kazanbas/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2009-kazanbas/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/soc-2009-kazanbas/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/soc-2009-kazanbas/release/ui/buttons_data_armature.py
branches/soc-2009-kazanbas/release/ui/buttons_data_bone.py
branches/soc-2009-kazanbas/release/ui/buttons_data_camera.py
branches/soc-2009-kazanbas/release/ui/buttons_material.py
branches/soc-2009-kazanbas/release/ui/buttons_object_constraint.py
branches/soc-2009-kazanbas/release/ui/buttons_objects.py
branches/soc-2009-kazanbas/release/ui/buttons_physic_cloth.py
branches/soc-2009-kazanbas/release/ui/buttons_scene.py
branches/soc-2009-kazanbas/release/ui/buttons_texture.py
branches/soc-2009-kazanbas/release/ui/space_info.py
branches/soc-2009-kazanbas/source/Makefile
branches/soc-2009-kazanbas/source/blender/blenfont/BLF_api.h
branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf.c
branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_font.c
branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_internal.h
branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_context.h
branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_particle.h
branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_report.h
branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_writeffmpeg.h
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/context.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/effect.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/exotic.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/image.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/material.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/modifier.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/object.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/particle.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/particle_system.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/pointcache.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/report.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/scene.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/sequence.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/texture.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/writeavi.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2009-kazanbas/source/blender/blenkernel/nla_private.h
branches/soc-2009-kazanbas/source/blender/blenlib/BLI_editVert.h
branches/soc-2009-kazanbas/source/blender/blenlib/intern/fileops.c
branches/soc-2009-kazanbas/source/blender/blenlib/intern/util.c
branches/soc-2009-kazanbas/source/blender/blenloader/intern/readfile.c
branches/soc-2009-kazanbas/source/blender/blenloader/intern/writefile.c
branches/soc-2009-kazanbas/source/blender/editors/Makefile
branches/soc-2009-kazanbas/source/blender/editors/SConscript
branches/soc-2009-kazanbas/source/blender/editors/animation/anim_channels.c
branches/soc-2009-kazanbas/source/blender/editors/animation/anim_markers.c
branches/soc-2009-kazanbas/source/blender/editors/animation/anim_ops.c
branches/soc-2009-kazanbas/source/blender/editors/animation/drivers.c
branches/soc-2009-kazanbas/source/blender/editors/animation/keyframes_general.c
branches/soc-2009-kazanbas/source/blender/editors/animation/keyframing.c
branches/soc-2009-kazanbas/source/blender/editors/armature/editarmature.c
branches/soc-2009-kazanbas/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2009-kazanbas/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2009-kazanbas/source/blender/editors/armature/poselib.c
branches/soc-2009-kazanbas/source/blender/editors/armature/poseobject.c
branches/soc-2009-kazanbas/source/blender/editors/curve/editcurve.c
branches/soc-2009-kazanbas/source/blender/editors/datafiles/B.blend.c
branches/soc-2009-kazanbas/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2009-kazanbas/source/blender/editors/include/ED_armature.h
branches/soc-2009-kazanbas/source/blender/editors/include/ED_curve.h
branches/soc-2009-kazanbas/source/blender/editors/include/ED_keyframing.h
branches/soc-2009-kazanbas/source/blender/editors/include/ED_mesh.h
branches/soc-2009-kazanbas/source/blender/editors/include/ED_object.h
branches/soc-2009-kazanbas/source/blender/editors/include/ED_space_api.h
branches/soc-2009-kazanbas/source/blender/editors/include/ED_transform.h
branches/soc-2009-kazanbas/source/blender/editors/include/UI_interface.h
branches/soc-2009-kazanbas/source/blender/editors/interface/interface.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_anim.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_intern.h
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_layout.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_panel.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_regions.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_style.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_templates.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_utils.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-kazanbas/source/blender/editors/interface/resources.c
branches/soc-2009-kazanbas/source/blender/editors/interface/view2d.c
branches/soc-2009-kazanbas/source/blender/editors/interface/view2d_ops.c
branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh.c
branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2009-kazanbas/source/blender/editors/mesh/meshtools.c
branches/soc-2009-kazanbas/source/blender/editors/object/editconstraint.c
branches/soc-2009-kazanbas/source/blender/editors/object/editgroup.c
branches/soc-2009-kazanbas/source/blender/editors/object/object_edit.c
branches/soc-2009-kazanbas/source/blender/editors/object/object_intern.h
branches/soc-2009-kazanbas/source/blender/editors/object/object_ops.c
branches/soc-2009-kazanbas/source/blender/editors/object/object_vgroup.c
branches/soc-2009-kazanbas/source/blender/editors/physics/ed_fluidsim.c
branches/soc-2009-kazanbas/source/blender/editors/physics/editparticle.c
branches/soc-2009-kazanbas/source/blender/editors/preview/previewrender.c
branches/soc-2009-kazanbas/source/blender/editors/screen/area.c
branches/soc-2009-kazanbas/source/blender/editors/screen/screen_ops.c
branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2009-kazanbas/source/blender/editors/space_action/action_edit.c
branches/soc-2009-kazanbas/source/blender/editors/space_action/action_select.c
branches/soc-2009-kazanbas/source/blender/editors/space_api/spacetypes.c
branches/soc-2009-kazanbas/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2009-kazanbas/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2009-kazanbas/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2009-kazanbas/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-kazanbas/source/blender/editors/space_file/file_draw.c
branches/soc-2009-kazanbas/source/blender/editors/space_file/file_ops.c
branches/soc-2009-kazanbas/source/blender/editors/space_file/filesel.c
branches/soc-2009-kazanbas/source/blender/editors/space_file/writeimage.c
branches/soc-2009-kazanbas/source/blender/editors/space_graph/graph_edit.c
branches/soc-2009-kazanbas/source/blender/editors/space_graph/graph_header.c
branches/soc-2009-kazanbas/source/blender/editors/space_graph/graph_intern.h
branches/soc-2009-kazanbas/source/blender/editors/space_graph/graph_ops.c
branches/soc-2009-kazanbas/source/blender/editors/space_graph/graph_select.c
branches/soc-2009-kazanbas/source/blender/editors/space_graph/graph_utils.c
branches/soc-2009-kazanbas/source/blender/editors/space_graph/space_graph.c
branches/soc-2009-kazanbas/source/blender/editors/space_image/image_buttons.c
branches/soc-2009-kazanbas/source/blender/editors/space_image/image_ops.c
branches/soc-2009-kazanbas/source/blender/editors/space_info/space_info.c
branches/soc-2009-kazanbas/source/blender/editors/space_nla/nla_edit.c
branches/soc-2009-kazanbas/source/blender/editors/space_nla/nla_header.c
branches/soc-2009-kazanbas/source/blender/editors/space_node/node_edit.c
branches/soc-2009-kazanbas/source/blender/editors/space_node/node_select.c
branches/soc-2009-kazanbas/source/blender/editors/space_outliner/outliner.c
branches/soc-2009-kazanbas/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2009-kazanbas/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2009-kazanbas/source/blender/editors/space_text/space_text.c
branches/soc-2009-kazanbas/source/blender/editors/space_text/text_draw.c
branches/soc-2009-kazanbas/source/blender/editors/space_text/text_intern.h
branches/soc-2009-kazanbas/source/blender/editors/space_text/text_ops.c
branches/soc-2009-kazanbas/source/blender/editors/space_text/text_python.c
branches/soc-2009-kazanbas/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-kazanbas/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2009-kazanbas/source/blender/editors/transform/transform.c
branches/soc-2009-kazanbas/source/blender/editors/transform/transform.h
branches/soc-2009-kazanbas/source/blender/editors/transform/transform_constraints.c
branches/soc-2009-kazanbas/source/blender/editors/transform/transform_conversions.c
branches/soc-2009-kazanbas/source/blender/editors/transform/transform_generics.c
branches/soc-2009-kazanbas/source/blender/editors/transform/transform_manipulator.c
branches/soc-2009-kazanbas/source/blender/editors/transform/transform_ops.c
branches/soc-2009-kazanbas/source/blender/editors/transform/transform_orientations.c
branches/soc-2009-kazanbas/source/blender/gpu/GPU_draw.h
branches/soc-2009-kazanbas/source/blender/gpu/intern/gpu_draw.c
branches/soc-2009-kazanbas/source/blender/makesdna/DNA_camera_types.h
branches/soc-2009-kazanbas/source/blender/makesdna/DNA_material_types.h
branches/soc-2009-kazanbas/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2009-kazanbas/source/blender/makesdna/DNA_object_types.h
branches/soc-2009-kazanbas/source/blender/makesdna/DNA_particle_types.h
branches/soc-2009-kazanbas/source/blender/makesdna/DNA_scene_types.h
branches/soc-2009-kazanbas/source/blender/makesdna/DNA_space_types.h
branches/soc-2009-kazanbas/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-kazanbas/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2009-kazanbas/source/blender/makesrna/RNA_access.h
branches/soc-2009-kazanbas/source/blender/makesrna/RNA_define.h
branches/soc-2009-kazanbas/source/blender/makesrna/SConscript
branches/soc-2009-kazanbas/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2009-kazanbas/source/blender/makesrna/intern/Makefile
branches/soc-2009-kazanbas/source/blender/makesrna/intern/SConscript
branches/soc-2009-kazanbas/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_access.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_armature.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_brush.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_camera.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_color.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_context.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_curve.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_internal.h
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_key.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_material.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_particle.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_pose.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_rna.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_screen.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_texture.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_world.c
branches/soc-2009-kazanbas/source/blender/python/generic/Mathutils.c
branches/soc-2009-kazanbas/source/blender/python/intern/bpy_interface.c
branches/soc-2009-kazanbas/source/blender/python/intern/bpy_operator.c
branches/soc-2009-kazanbas/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2009-kazanbas/source/blender/python/intern/bpy_rna.c
branches/soc-2009-kazanbas/source/blender/python/intern/bpy_ui.c
branches/soc-2009-kazanbas/source/blender/python/intern/bpy_util.c
branches/soc-2009-kazanbas/source/blender/render/intern/source/convertblender.c
branches/soc-2009-kazanbas/source/blender/render/intern/source/initrender.c
branches/soc-2009-kazanbas/source/blender/render/intern/source/pipeline.c
branches/soc-2009-kazanbas/source/blender/windowmanager/WM_api.h
branches/soc-2009-kazanbas/source/blender/windowmanager/WM_types.h
branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm.c
branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2009-kazanbas/source/blender/windowmanager/wm.h
branches/soc-2009-kazanbas/source/nan_definitions.mk
branches/soc-2009-kazanbas/tests/SConscript
Added Paths:
-----------
branches/soc-2009-kazanbas/release/ui/space_console.py
branches/soc-2009-kazanbas/release/ui/space_view3d.py
branches/soc-2009-kazanbas/release/windows/extra/python30.zip
branches/soc-2009-kazanbas/release/windows/extra/python31.zip
branches/soc-2009-kazanbas/source/blender/editors/space_console/
branches/soc-2009-kazanbas/source/blender/editors/space_console/Makefile
branches/soc-2009-kazanbas/source/blender/editors/space_console/SConscript
branches/soc-2009-kazanbas/source/blender/editors/space_console/console_draw.c
branches/soc-2009-kazanbas/source/blender/editors/space_console/console_intern.h
branches/soc-2009-kazanbas/source/blender/editors/space_console/console_ops.c
branches/soc-2009-kazanbas/source/blender/editors/space_console/space_console.c
Removed Paths:
-------------
branches/soc-2009-kazanbas/source/blender/editors/space_console/Makefile
branches/soc-2009-kazanbas/source/blender/editors/space_console/SConscript
branches/soc-2009-kazanbas/source/blender/editors/space_console/console_draw.c
branches/soc-2009-kazanbas/source/blender/editors/space_console/console_intern.h
branches/soc-2009-kazanbas/source/blender/editors/space_console/console_ops.c
branches/soc-2009-kazanbas/source/blender/editors/space_console/space_console.c
Property Changed:
----------------
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2009-kazanbas/source/blender/blenkernel/nla_private.h
branches/soc-2009-kazanbas/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2009-kazanbas/source/blender/editors/space_graph/graph_utils.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_nla.c
Modified: branches/soc-2009-kazanbas/config/win32-mingw-config.py
===================================================================
--- branches/soc-2009-kazanbas/config/win32-mingw-config.py 2009-07-16
08:20:27 UTC (rev 21622)
+++ branches/soc-2009-kazanbas/config/win32-mingw-config.py 2009-07-16
09:09:38 UTC (rev 21623)
@@ -2,7 +2,7 @@
LIBDIR = "${LCGDIR}"
BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '2.5'
+BF_PYTHON_VERSION = '3.1'
#BF_PYTHON_VERSION = '2.6'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
Modified: branches/soc-2009-kazanbas/config/win32-vc-config.py
===================================================================
--- branches/soc-2009-kazanbas/config/win32-vc-config.py 2009-07-16
08:20:27 UTC (rev 21622)
+++ branches/soc-2009-kazanbas/config/win32-vc-config.py 2009-07-16
09:09:38 UTC (rev 21623)
@@ -9,10 +9,10 @@
BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib
swscale-0.lib'
BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '2.6'
+BF_PYTHON_VERSION = '3.1'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python26'
+BF_PYTHON_LIB = 'python31'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
WITH_BF_OPENAL = True
@@ -149,7 +149,7 @@
CC = 'cl.exe'
CXX = 'cl.exe'
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT', '/wd4244', '/wd4305',
'/wd4800']
CXXFLAGS = ['/EHsc']
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
Modified: branches/soc-2009-kazanbas/config/win64-vc-config.py
===================================================================
--- branches/soc-2009-kazanbas/config/win64-vc-config.py 2009-07-16
08:20:27 UTC (rev 21622)
+++ branches/soc-2009-kazanbas/config/win64-vc-config.py 2009-07-16
09:09:38 UTC (rev 21623)
@@ -9,10 +9,10 @@
BF_FFMPEG_LIB = 'avformat-52.lib avcodec-51.lib avdevice-52.lib avutil-49.lib
swscale-0.lib'
BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.0'
+BF_PYTHON_VERSION = '3.1'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python30'
+BF_PYTHON_LIB = 'python31'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
WITH_BF_OPENAL = False
@@ -152,7 +152,7 @@
CC = 'cl.exe'
CXX = 'cl.exe'
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT', '/wd4244', '/wd4305',
'/wd4800']
CXXFLAGS = ['/EHsc']
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
Modified: branches/soc-2009-kazanbas/projectfiles_vc9/blender/blender.vcproj
===================================================================
--- branches/soc-2009-kazanbas/projectfiles_vc9/blender/blender.vcproj
2009-07-16 08:20:27 UTC (rev 21622)
+++ branches/soc-2009-kazanbas/projectfiles_vc9/blender/blender.vcproj
2009-07-16 09:09:38 UTC (rev 21623)
@@ -209,39 +209,6 @@
</References>
<Files>
<Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath="..\..\source\creator\buildinfo.c"
- >
- </File>
- <File
- RelativePath="..\..\source\creator\creator.c"
- >
- </File>
- <File
- RelativePath="..\..\source\icons\winblender.rc"
- >
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
-
AdditionalIncludeDirectories="\blenderdev\blender.test2\source\icons;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Blender Debug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
-
AdditionalIncludeDirectories="\blenderdev\blender.test2\source\icons;$(NoInherit)"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
Name="Resource Files"
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
>
@@ -253,6 +220,39 @@
RelativePath="..\..\source\icons\winblenderfile.ico"
>
</File>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+
RelativePath="..\..\source\creator\buildinfo.c"
+ >
+ </File>
+ <File
+
RelativePath="..\..\source\creator\creator.c"
+ >
+ </File>
+ <File
+
RelativePath="..\..\source\icons\winblender.rc"
+ >
+ <FileConfiguration
+ Name="Blender Release|Win32"
+ >
+ <Tool
+
Name="VCResourceCompilerTool"
+
AdditionalIncludeDirectories="\blenderdev\blender.test2\source\icons;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Blender Debug|Win32"
+ >
+ <Tool
+
Name="VCResourceCompilerTool"
+
AdditionalIncludeDirectories="\blenderdev\blender.test2\source\icons;$(NoInherit)"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
</Filter>
<Filter
Name="Header Files"
Modified:
branches/soc-2009-kazanbas/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
===================================================================
---
branches/soc-2009-kazanbas/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
2009-07-16 08:20:27 UTC (rev 21622)
+++
branches/soc-2009-kazanbas/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
2009-07-16 09:09:38 UTC (rev 21623)
@@ -610,6 +610,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\blenkernel\intern\fmodifier.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenkernel\intern\font.c"
>
</File>
@@ -1098,6 +1102,14 @@
RelativePath="..\..\..\source\blender\blenkernel\depsgraph_private.h"
>
</File>
+ <File
+
RelativePath="..\..\..\source\blender\blenkernel\Makefile"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\blenkernel\nla_private.h"
+ >
+ </File>
</Filter>
</Files>
<Globals>
Modified:
branches/soc-2009-kazanbas/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
---
branches/soc-2009-kazanbas/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-07-16 08:20:27 UTC (rev 21622)
+++
branches/soc-2009-kazanbas/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-07-16 09:09:38 UTC (rev 21623)
@@ -639,6 +639,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\space_graph\graph_utils.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\space_graph\space_graph.c"
>
</File>
@@ -839,6 +843,22 @@
Name="space_nla"
>
<File
+
RelativePath="..\..\..\source\blender\editors\space_nla\nla_buttons.c"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\editors\space_nla\nla_channels.c"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\editors\space_nla\nla_draw.c"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\editors\space_nla\nla_edit.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\space_nla\nla_header.c"
>
</File>
@@ -847,6 +867,14 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\space_nla\nla_ops.c"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\editors\space_nla\nla_select.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\space_nla\space_nla.c"
>
</File>
@@ -999,6 +1027,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\animation\fmodifier_ui.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\animation\keyframes_draw.c"
>
</File>
Modified:
branches/soc-2009-kazanbas/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
===================================================================
---
branches/soc-2009-kazanbas/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
2009-07-16 08:20:27 UTC (rev 21622)
+++
branches/soc-2009-kazanbas/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
2009-07-16 09:09:38 UTC (rev 21623)
@@ -711,6 +711,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\makesrna\intern\rna_nla.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_nodetree.c"
>
</File>
Modified:
branches/soc-2009-kazanbas/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
===================================================================
--- branches/soc-2009-kazanbas/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
2009-07-16 08:20:27 UTC (rev 21622)
+++ branches/soc-2009-kazanbas/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
2009-07-16 09:09:38 UTC (rev 21623)
@@ -271,6 +271,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\makesrna\intern\rna_nla_gen.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_nodetree_gen.c"
>
</File>
Modified: branches/soc-2009-kazanbas/release/ui/buttons_data_armature.py
===================================================================
--- branches/soc-2009-kazanbas/release/ui/buttons_data_armature.py
2009-07-16 08:20:27 UTC (rev 21622)
+++ branches/soc-2009-kazanbas/release/ui/buttons_data_armature.py
2009-07-16 09:09:38 UTC (rev 21623)
@@ -42,11 +42,12 @@
if arm:
- layout.itemR(arm, "rest_position")
-
split = layout.split()
- sub = split.column()
+ col = split.column()
+ col.itemR(arm, "rest_position")
+
+ sub = col.column()
sub.itemL(text="Deform:")
sub.itemR(arm, "deform_vertexgroups", text="Vertes
Groups")
sub.itemR(arm, "deform_envelope", text="Envelopes")
@@ -69,17 +70,14 @@
layout = self.layout
arm = context.armature
- split = layout.split()
+ layout.row().itemR(arm, "drawtype", expand=True)
- sub = split.column()
- sub.itemR(arm, "drawtype", text="Style")
- sub.itemR(arm, "delay_deform", text="Delay Refresh")
-
- sub = split.column()
+ sub = layout.column_flow()
sub.itemR(arm, "draw_names", text="Names")
sub.itemR(arm, "draw_axes", text="Axes")
sub.itemR(arm, "draw_custom_bone_shapes", text="Shapes")
sub.itemR(arm, "draw_group_colors", text="Colors")
+ sub.itemR(arm, "delay_deform", text="Delay Refresh")
class DATA_PT_paths(DataButtonsPanel):
__idname__ = "DATA_PT_paths"
@@ -93,14 +91,15 @@
sub = split.column()
sub.itemR(arm, "paths_show_around_current_frame", text="Around
Frame")
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
