[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21412] branches/soc-2009-yukishiro: merge till 21411
Jingyuan Huang
jingyuan.huang at gmail.com
Tue Jul 7 20:58:11 CEST 2009
Revision: 21412
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21412
Author: yukishiro
Date: 2009-07-07 20:58:11 +0200 (Tue, 07 Jul 2009)
Log Message:
-----------
merge till 21411
Modified Paths:
--------------
branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.sln
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_modifier.py
branches/soc-2009-yukishiro/release/ui/space_filebrowser.py
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/modifier.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
branches/soc-2009-yukishiro/source/blender/editors/include/ED_fileselect.h
branches/soc-2009-yukishiro/source/blender/editors/interface/view2d.c
branches/soc-2009-yukishiro/source/blender/editors/object/object_edit.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/filelist.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/filelist.h
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_node/node_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_node/node_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_node/node_ops.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_space_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_event_system.c
Modified: branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.sln
===================================================================
--- branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.sln 2009-07-07 17:30:39 UTC (rev 21411)
+++ branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.sln 2009-07-07 18:58:11 UTC (rev 21412)
@@ -294,7 +294,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RNA_makesrna", "makesrna\RNA_makesrna.vcproj", "{8C2BCCF8-4D9E-46D3-BABF-C1545A332CE6}"
ProjectSection(ProjectDependencies) = postProject
- {FB88301F-F725-401B-ACD7-D2ABBF333B71} = {FB88301F-F725-401B-ACD7-D2ABBF333B71}
{7495FE37-933A-4AC1-BB2A-B3FDB4DE4284} = {7495FE37-933A-4AC1-BB2A-B3FDB4DE4284}
EndProjectSection
EndProject
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-07 17:30:39 UTC (rev 21411)
+++ branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-07-07 18:58:11 UTC (rev 21412)
@@ -1062,6 +1062,10 @@
RelativePath="..\..\..\source\blender\editors\object\object_ops.c"
>
</File>
+ <File
+ RelativePath="..\..\..\source\blender\editors\object\object_vgroup.c"
+ >
+ </File>
</Filter>
<Filter
Name="transform"
@@ -1119,10 +1123,6 @@
Name="mesh"
>
<File
- RelativePath="..\..\..\source\blender\editors\mesh\editdeform.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\editors\mesh\editface.c"
>
</File>
@@ -1155,6 +1155,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\editors\mesh\mesh_layers.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\mesh\mesh_ops.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-07 17:30:39 UTC (rev 21411)
+++ branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj 2009-07-07 18:58:11 UTC (rev 21412)
@@ -27,6 +27,7 @@
>
<Tool
Name="VCPreBuildEventTool"
+ CommandLine="DEL ..\..\..\source\blender\makesrna\intern\*_gen.c"
/>
<Tool
Name="VCCustomBuildTool"
@@ -121,6 +122,7 @@
>
<Tool
Name="VCPreBuildEventTool"
+ CommandLine="DEL ..\..\..\source\blender\makesrna\intern\*_gen.c"
/>
<Tool
Name="VCCustomBuildTool"
@@ -199,7 +201,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="Building RNA"
- CommandLine="CD ..\..\..\source\blender\makesrna\intern
RNA_makesrna.exe rna.c
"
+ CommandLine="CD ..\..\..\source\blender\makesrna\intern\
RNA_makesrna.exe .\
"
/>
</Configuration>
<Configuration
@@ -214,6 +216,7 @@
>
<Tool
Name="VCPreBuildEventTool"
+ CommandLine="DEL ..\..\..\source\blender\makesrna\intern\*_gen.c"
/>
<Tool
Name="VCCustomBuildTool"
@@ -307,6 +310,7 @@
>
<Tool
Name="VCPreBuildEventTool"
+ CommandLine="del ..\..\..\source\blender\makesrna\intern\rna_*_gen.c"
/>
<Tool
Name="VCCustomBuildTool"
@@ -388,7 +392,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="Building RNA"
- CommandLine="CD ..\..\..\source\blender\makesrna\intern
RNA_makesrna.exe rna.c
"
+ CommandLine="CD ..\..\..\source\blender\makesrna\intern\
RNA_makesrna.exe .\
"
/>
</Configuration>
<Configuration
@@ -403,6 +407,7 @@
>
<Tool
Name="VCPreBuildEventTool"
+ CommandLine="DEL ..\..\..\source\blender\makesrna\intern\*_gen.c"
/>
<Tool
Name="VCCustomBuildTool"
@@ -484,7 +489,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="Building RNA"
- CommandLine="CD ..\..\..\source\blender\makesrna\intern
RNA_makesrna.exe rna.c
"
+ CommandLine="CD ..\..\..\source\blender\makesrna\intern\
RNA_makesrna.exe .\
"
/>
</Configuration>
<Configuration
@@ -499,6 +504,7 @@
>
<Tool
Name="VCPreBuildEventTool"
+ CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
@@ -577,7 +583,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="Building RNA"
- CommandLine="CD ..\..\..\source\blender\makesrna\intern
RNA_makesrna.exe rna.c
"
+ CommandLine="CD ..\..\..\source\blender\makesrna\intern\
RNA_makesrna.exe .\
"
/>
</Configuration>
</Configurations>
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-07 17:30:39 UTC (rev 21411)
+++ branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj 2009-07-07 18:58:11 UTC (rev 21412)
@@ -167,209 +167,205 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_action_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_access.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_actuator_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_action_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_animation_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_actuator_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_armature_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_animation_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.cRNA_blender_cpp.h"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_armature_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_brush_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_brush_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_camera_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_camera_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_cloth_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_cloth_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_color_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_color_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_constraint_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_constraint_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_context_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_context_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_controller_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_controller_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_curve_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_curve_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_fcurve_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_fcurve_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_fluidsim_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_fluidsim_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_group_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_group_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_ID_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_ID_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_image_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_image_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_key_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_key_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_lamp_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_lamp_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_lattice_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_lattice_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_main_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_main_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_material_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_material_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_mesh_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_mesh_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_meta_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_meta_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_modifier_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_modifier_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_nodetree_gen.c"
+ RelativePath="..\..\..\source\blender\makesrna\intern\rna_nodetree_gen.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_object_force_gen.c"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list