Revision: 21576
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21576
Author: yukishiro
Date: 2009-07-14 16:24:25 +0200 (Tue, 14 Jul 2009)
Log Message:
-----------
merge till 21575
Modified Paths:
--------------
branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.vcproj
branches/soc-2009-yukishiro/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.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/release/ui/buttons_data_bone.py
branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py
branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py
branches/soc-2009-yukishiro/release/ui/buttons_material.py
branches/soc-2009-yukishiro/release/ui/buttons_object_constraint.py
branches/soc-2009-yukishiro/release/ui/buttons_particle.py
branches/soc-2009-yukishiro/release/ui/buttons_physic_cloth.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/space_sequencer.py
branches/soc-2009-yukishiro/release/ui/space_text.py
branches/soc-2009-yukishiro/source/blender/blenfont/BLF_api.h
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_font.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal.h
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_action.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_context.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_nla.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_particle.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_writeffmpeg.h
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/action.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/context.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/exotic.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/fcurve.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/image.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/ipo.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/material.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/nla.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/scene.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/sequence.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/texture.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/writeavi.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_editVert.h
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_util.h
branches/soc-2009-yukishiro/source/blender/blenlib/intern/fileops.c
branches/soc-2009-yukishiro/source/blender/blenlib/intern/util.c
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/anim_channels.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_deps.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_draw.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_filter.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_markers.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_ops.c
branches/soc-2009-yukishiro/source/blender/editors/animation/drivers.c
branches/soc-2009-yukishiro/source/blender/editors/animation/keyframes_draw.c
branches/soc-2009-yukishiro/source/blender/editors/animation/keyframes_edit.c
branches/soc-2009-yukishiro/source/blender/editors/animation/keyframes_general.c
branches/soc-2009-yukishiro/source/blender/editors/animation/keyframing.c
branches/soc-2009-yukishiro/source/blender/editors/animation/keyingsets.c
branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature.c
branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2009-yukishiro/source/blender/editors/armature/poselib.c
branches/soc-2009-yukishiro/source/blender/editors/curve/editcurve.c
branches/soc-2009-yukishiro/source/blender/editors/datafiles/B.blend.c
branches/soc-2009-yukishiro/source/blender/editors/include/ED_anim_api.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_armature.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_curve.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_keyframes_draw.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_keyframing.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_mesh.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_object.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_screen.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_screen_types.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_transform.h
branches/soc-2009-yukishiro/source/blender/editors/include/UI_interface.h
branches/soc-2009-yukishiro/source/blender/editors/include/UI_view2d.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_anim.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_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_widgets.c
branches/soc-2009-yukishiro/source/blender/editors/interface/resources.c
branches/soc-2009-yukishiro/source/blender/editors/interface/view2d.c
branches/soc-2009-yukishiro/source/blender/editors/interface/view2d_ops.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/mesh_ops.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/meshtools.c
branches/soc-2009-yukishiro/source/blender/editors/object/editconstraint.c
branches/soc-2009-yukishiro/source/blender/editors/object/editgroup.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/physics/editparticle.c
branches/soc-2009-yukishiro/source/blender/editors/screen/area.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/sculpt_paint/paint_image.c
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_select.c
branches/soc-2009-yukishiro/source/blender/editors/space_action/space_action.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_file/file_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/filesel.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/space_file.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/writeimage.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_select.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/space_graph.c
branches/soc-2009-yukishiro/source/blender/editors/space_image/image_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_image/image_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_image/image_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/nla_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/nla_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_nla/space_nla.c
branches/soc-2009-yukishiro/source/blender/editors/space_node/node_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_node/node_select.c
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner.c
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_text/space_text.c
branches/soc-2009-yukishiro/source/blender/editors/space_text/text_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_text/text_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_text/text_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_text/text_python.c
branches/soc-2009-yukishiro/source/blender/editors/space_time/time_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_select.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_constraints.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_conversions.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_generics.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_manipulator.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_ops.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_orientations.c
branches/soc-2009-yukishiro/source/blender/gpu/GPU_draw.h
branches/soc-2009-yukishiro/source/blender/gpu/intern/gpu_draw.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_action_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_anim_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_camera_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_curve_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_image_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_material_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_meshdata_types.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_scene_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_space_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_userdef_types.h
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_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_access.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_animation.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_brush.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_camera.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_color.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_curve.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_internal.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_key.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_material.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_particle.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_rna.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/python/generic/Mathutils.c
branches/soc-2009-yukishiro/source/blender/python/generic/Mathutils.h
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_interface.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_operator.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_util.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/convertblender.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/initrender.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/pipeline.c
branches/soc-2009-yukishiro/source/blender/windowmanager/WM_api.h
branches/soc-2009-yukishiro/source/blender/windowmanager/WM_types.h
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_cursors.c
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_operators.c
branches/soc-2009-yukishiro/source/nan_definitions.mk
Added Paths:
-----------
branches/soc-2009-yukishiro/release/ui/space_view3d.py
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2009-yukishiro/source/blender/blenkernel/nla_private.h
branches/soc-2009-yukishiro/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_utils.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/nla_channels.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/nla_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/nla_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/nla_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/nla_select.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_nla.c
Removed Paths:
-------------
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_header.c
Modified: branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.vcproj
===================================================================
--- branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.vcproj
2009-07-14 13:20:46 UTC (rev 21575)
+++ branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.vcproj
2009-07-14 14:24:25 UTC (rev 21576)
@@ -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-yukishiro/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
===================================================================
---
branches/soc-2009-yukishiro/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
2009-07-14 13:20:46 UTC (rev 21575)
+++
branches/soc-2009-yukishiro/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
2009-07-14 14:24:25 UTC (rev 21576)
@@ -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-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
---
branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-07-14 13:20:46 UTC (rev 21575)
+++
branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-07-14 14:24:25 UTC (rev 21576)
@@ -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>
@@ -747,10 +751,6 @@
>
</File>
<File
-
RelativePath="..\..\..\source\blender\editors\space_file\file_header.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\editors\space_file\file_intern.h"
>
</File>
@@ -843,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>
@@ -851,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>
@@ -1003,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-yukishiro/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
===================================================================
---
branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
2009-07-14 13:20:46 UTC (rev 21575)
+++
branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
2009-07-14 14:24:25 UTC (rev 21576)
@@ -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-yukishiro/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
===================================================================
---
branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
2009-07-14 13:20:46 UTC (rev 21575)
+++
branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
2009-07-14 14:24:25 UTC (rev 21576)
@@ -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-yukishiro/release/ui/buttons_data_bone.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_bone.py 2009-07-14
13:20:46 UTC (rev 21575)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_bone.py 2009-07-14
14:24:25 UTC (rev 21576)
@@ -23,6 +23,23 @@
split.itemL(text="", icon="ICON_BONE_DATA")
split.itemR(bone, "name", text="")
+class BONE_PT_transform_bone(BoneButtonsPanel):
+ __idname__ = "BONE_PT_transform_bone"
+ __label__ = "Transform"
+
+ def draw(self, context):
+ layout = self.layout
+ bone = context.bone
+ if not bone:
+ bone = context.edit_bone
+
+#Seems to be missing from RNA?
+ row = layout.row()
+ row.column().itemR(bone, "location")
+ row.column().itemR(bone, "rotation")
+ row.column().itemR(bone, "scale")
+
+
class BONE_PT_bone(BoneButtonsPanel):
__idname__ = "BONE_PT_bone"
__label__ = "Bone"
@@ -93,5 +110,6 @@
bpy.types.register(BONE_PT_context_bone)
+bpy.types.register(BONE_PT_transform_bone)
bpy.types.register(BONE_PT_bone)
bpy.types.register(BONE_PT_deform)
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py
2009-07-14 13:20:46 UTC (rev 21575)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py
2009-07-14 14:24:25 UTC (rev 21576)
@@ -38,7 +38,6 @@
cam = context.camera
- layout.itemS()
layout.itemR(cam, "type", expand=True)
row = layout.row(align=True)
@@ -51,6 +50,10 @@
elif cam.type == 'ORTHO':
row.itemR(cam, "ortho_scale")
+
+ split = layout.split()
+ split.itemR(cam, "panorama");
+ split.itemL()
split = layout.split()
@@ -64,9 +67,13 @@
sub.itemR(cam, "clip_start", text="Start")
sub.itemR(cam, "clip_end", text="End")
- row = layout.row()
- row.itemR(cam, "dof_object")
- row.itemR(cam, "dof_distance")
+ split = layout.split()
+ col = split.column()
+ col.itemL(text="Depth of Field:")
+ col.itemR(cam, "dof_object", text="")
+ col = split.column()
+ col.itemL()
+ col.itemR(cam, "dof_distance", text="Distance")
class DATA_PT_camera_display(DataButtonsPanel):
__idname__ = "DATA_PT_camera_display"
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py 2009-07-14
13:20:46 UTC (rev 21575)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py 2009-07-14
14:24:25 UTC (rev 21576)
@@ -48,7 +48,7 @@
lamp = context.lamp
- layout.itemR(lamp, "type", expand=True)
+ layout.itemR(lamp, "type")
split = layout.split()
Modified: branches/soc-2009-yukishiro/release/ui/buttons_material.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_material.py 2009-07-14
13:20:46 UTC (rev 21575)
+++ branches/soc-2009-yukishiro/release/ui/buttons_material.py 2009-07-14
14:24:25 UTC (rev 21576)
@@ -47,11 +47,11 @@
if ob and slot:
split.template_ID(slot, "material",
new="MATERIAL_OT_new")
- #split.itemR(ob, "active_material_index", text="Active")
+ row = split.row()
+ row.itemR(slot, "link", expand=True)
elif mat:
split.template_ID(space, "pin_id")
split.itemS()
-
class MATERIAL_PT_material(MaterialButtonsPanel):
__idname__= "MATERIAL_PT_material"
@@ -142,14 +142,12 @@
sub.itemR(mat, "cast_shadows_only", text="Cast Only")
sub.itemR(mat, "shadow_casting_alpha", text="Casting Alpha",
slider=True)
- sub.itemR(mat, "ray_shadow_bias")
+ sub.itemR(mat, "ray_shadow_bias", text="Auto Ray Bias")
colsub = sub.column()
- colsub.active = mat.ray_shadow_bias
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
