[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18433] branches/bmesh/blender: merge with 2.5 at revision 18432, made bmesh compile, and also made msvc use incremental linking under scons
joe
joeedh at gmail.com
Fri Jan 9 19:35:42 CET 2009
isn't that the wrong revision link?
On Fri, Jan 9, 2009 at 11:32 AM, Joseph Eagar <joeedh at gmail.com> wrote:
> Revision: 18433
>
> http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18433
> Author: joeedh
> Date: 2009-01-09 19:32:33 +0100 (Fri, 09 Jan 2009)
>
> Log Message:
> -----------
> merge with 2.5 at revision 18432, made bmesh compile, and also made msvc
> use incremental linking under scons
>
> Revision Links:
> --------------
>
> http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18432
>
> Modified Paths:
> --------------
> branches/bmesh/blender/config/win32-vc-config.py
> branches/bmesh/blender/intern/ghost/Makefile
>
> branches/bmesh/blender/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
>
> branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
>
> branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
> branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
> branches/bmesh/blender/source/Makefile
> branches/bmesh/blender/source/blender/SConscript
> branches/bmesh/blender/source/blender/blenkernel/BKE_booleanops.h
> branches/bmesh/blender/source/blender/blenkernel/BKE_lattice.h
> branches/bmesh/blender/source/blender/blenkernel/BKE_screen.h
> branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
> branches/bmesh/blender/source/blender/blenkernel/SConscript
> branches/bmesh/blender/source/blender/blenkernel/intern/Makefile
> branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
> branches/bmesh/blender/source/blender/blenkernel/intern/blender.c
> branches/bmesh/blender/source/blender/blenkernel/intern/lattice.c
> branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c
> branches/bmesh/blender/source/blender/blenkernel/intern/object.c
> branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
>
> branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
> branches/bmesh/blender/source/blender/blenkernel/intern/screen.c
> branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
> branches/bmesh/blender/source/blender/bmesh/SConscript
> branches/bmesh/blender/source/blender/bmesh/intern/bmesh_to_editmesh.c
> branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c
> branches/bmesh/blender/source/blender/editors/armature/SConscript
> branches/bmesh/blender/source/blender/editors/armature/editarmature.c
> branches/bmesh/blender/source/blender/editors/include/ED_armature.h
> branches/bmesh/blender/source/blender/editors/include/ED_fileselect.h
> branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
> branches/bmesh/blender/source/blender/editors/include/ED_space_api.h
> branches/bmesh/blender/source/blender/editors/include/ED_view3d.h
> branches/bmesh/blender/source/blender/editors/mesh/SConscript
> branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
> branches/bmesh/blender/source/blender/editors/object/object_edit.c
> branches/bmesh/blender/source/blender/editors/object/object_intern.h
> branches/bmesh/blender/source/blender/editors/object/object_ops.c
> branches/bmesh/blender/source/blender/editors/screen/area.c
> branches/bmesh/blender/source/blender/editors/screen/screen_edit.c
> branches/bmesh/blender/source/blender/editors/sculpt/sculpt.c
> branches/bmesh/blender/source/blender/editors/sculpt/sculpt_intern.h
> branches/bmesh/blender/source/blender/editors/sculpt/stroke.c
> branches/bmesh/blender/source/blender/editors/space_api/spacetypes.c
> branches/bmesh/blender/source/blender/editors/space_file/file_draw.c
> branches/bmesh/blender/source/blender/editors/space_file/file_header.c
> branches/bmesh/blender/source/blender/editors/space_file/file_ops.c
> branches/bmesh/blender/source/blender/editors/space_file/filesel.c
> branches/bmesh/blender/source/blender/editors/space_file/space_file.c
> branches/bmesh/blender/source/blender/editors/space_node/node_select.c
> branches/bmesh/blender/source/blender/editors/space_outliner/outliner.c
> branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
>
> branches/bmesh/blender/source/blender/editors/space_view3d/space_view3d.c
> branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
> branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
>
> branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
>
> branches/bmesh/blender/source/blender/editors/space_view3d/view3d_intern.h
> branches/bmesh/blender/source/blender/editors/space_view3d/view3d_ops.c
>
> branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
> branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
> branches/bmesh/blender/source/blender/editors/transform/transform.c
> branches/bmesh/blender/source/blender/editors/transform/transform.h
>
> branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
>
> branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
> branches/bmesh/blender/source/blender/editors/transform/transform_ops.c
> branches/bmesh/blender/source/blender/makesdna/DNA_lattice_types.h
> branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
> branches/bmesh/blender/source/blender/makesdna/DNA_windowmanager_types.h
> branches/bmesh/blender/source/blender/makesrna/RNA_access.h
> branches/bmesh/blender/source/blender/makesrna/RNA_define.h
> branches/bmesh/blender/source/blender/makesrna/RNA_types.h
> branches/bmesh/blender/source/blender/makesrna/intern/CMakeLists.txt
> branches/bmesh/blender/source/blender/makesrna/intern/Makefile
> branches/bmesh/blender/source/blender/makesrna/intern/SConscript
> branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
> branches/bmesh/blender/source/blender/makesrna/intern/rna_ID.c
> branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
> branches/bmesh/blender/source/blender/makesrna/intern/rna_action.c
> branches/bmesh/blender/source/blender/makesrna/intern/rna_constraint.c
> branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
> branches/bmesh/blender/source/blender/makesrna/intern/rna_internal.h
>
> branches/bmesh/blender/source/blender/makesrna/intern/rna_internal_types.h
> branches/bmesh/blender/source/blender/makesrna/intern/rna_lattice.c
> branches/bmesh/blender/source/blender/makesrna/intern/rna_material.c
> branches/bmesh/blender/source/blender/makesrna/intern/rna_meta.c
> branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c
> branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
> branches/bmesh/blender/source/blender/makesrna/intern/rna_rna.c
> branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
> branches/bmesh/blender/source/blender/makesrna/intern/rna_text.c
> branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
> branches/bmesh/blender/source/blender/makesrna/intern/rna_world.c
> branches/bmesh/blender/source/blender/python/epy_doc_gen.py
> branches/bmesh/blender/source/blender/python/intern/bpy_operator.c
> branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
> branches/bmesh/blender/source/blender/python/intern/bpy_rna.h
>
> branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
> branches/bmesh/blender/source/blender/windowmanager/WM_api.h
> branches/bmesh/blender/source/blender/windowmanager/intern/wm.c
>
> branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
>
> branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
> branches/bmesh/blender/source/blender/windowmanager/wm.h
> branches/bmesh/blender/tools/Blender.py
>
> Added Paths:
> -----------
> branches/bmesh/blender/source/blender/blenkernel/intern/booleanops.c
>
> branches/bmesh/blender/source/blender/blenkernel/intern/booleanops_mesh.c
> branches/bmesh/blender/source/blender/editors/interface/keyval.c
> branches/bmesh/blender/source/blender/editors/mesh/editdeform.c
> branches/bmesh/blender/source/blender/editors/screen/screendump.c
> branches/bmesh/blender/source/blender/editors/space_ipo/ipo_draw.c
> branches/bmesh/blender/source/blender/editors/space_view3d/vpaint.c
>
> Modified: branches/bmesh/blender/config/win32-vc-config.py
> ===================================================================
> --- branches/bmesh/blender/config/win32-vc-config.py 2009-01-09 16:08:47
> UTC (rev 18432)
> +++ branches/bmesh/blender/config/win32-vc-config.py 2009-01-09 18:32:33
> UTC (rev 18433)
> @@ -180,7 +180,7 @@
>
> LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32',
> 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
>
> -PLATFORM_LINKFLAGS =
> ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/ENTRY:mainCRTStartup','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/LARGEADDRESSAWARE']
> +PLATFORM_LINKFLAGS =
> ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/ENTRY:mainCRTStartup','/INCREMENTAL:YES','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/LARGEADDRESSAWARE']
>
> # # Todo
> # BF_PROFILE_CCFLAGS = ['-pg', '-g ']
>
> Modified: branches/bmesh/blender/intern/ghost/Makefile
> ===================================================================
> --- branches/bmesh/blender/intern/ghost/Makefile 2009-01-09 16:08:47
> UTC (rev 18432)
> +++ branches/bmesh/blender/intern/ghost/Makefile 2009-01-09 18:32:33
> UTC (rev 18433)
> @@ -38,7 +38,7 @@
>
> include nan_subdirs.mk
>
> -install: all
> +install: all debug
> @[ -d $(NAN_GHOST) ] || mkdir $(NAN_GHOST)
> @[ -d $(NAN_GHOST)/include ] || mkdir $(NAN_GHOST)/include
> @[ -d $(NAN_GHOST)/lib ] || mkdir $(NAN_GHOST)/lib
>
> Modified:
> branches/bmesh/blender/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
> ===================================================================
> ---
> branches/bmesh/blender/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
> 2009-01-09 16:08:47 UTC (rev 18432)
> +++
> branches/bmesh/blender/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
> 2009-01-09 18:32:33 UTC (rev 18433)
> @@ -518,6 +518,14 @@
> >
> </File>
> <File
> +
> RelativePath="..\..\..\source\blender\blenkernel\intern\booleanops.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\blenkernel\intern\booleanops_mesh.c"
> + >
> + </File>
> + <File
>
> RelativePath="..\..\..\source\blender\blenkernel\intern\brush.c"
> >
> </File>
>
> Modified:
> branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
> ===================================================================
> ---
> branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
> 2009-01-09 16:08:47 UTC (rev 18432)
> +++
> branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
> 2009-01-09 18:32:33 UTC (rev 18433)
> @@ -343,6 +343,10 @@
> >
> </File>
> <File
> +
> RelativePath="..\..\..\source\blender\editors\interface\keyval.c"
> + >
> + </File>
> + <File
>
> RelativePath="..\..\..\source\blender\editors\interface\resources.c"
> >
> </File>
> @@ -406,6 +410,10 @@
>
> RelativePath="..\..\..\source\blender\editors\space_view3d\view3d_view.c"
> >
> </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\editors\space_view3d\vpaint.c"
> + >
> + </File>
> </Filter>
> <Filter
> Name="space_time"
> @@ -478,6 +486,10 @@
>
> RelativePath="..\..\..\source\blender\editors\screen\screen_ops.c"
> >
> </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\editors\screen\screendump.c"
> + >
> + </File>
> </Filter>
> <Filter
> Name="util"
> @@ -903,6 +915,10 @@
> Name="mesh"
> >
> <File
> +
> RelativePath="..\..\..\source\blender\editors\mesh\editdeform.c"
> + >
> + </File>
> + <File
>
> RelativePath="..\..\..\source\blender\editors\mesh\editface.c"
> >
> </File>
>
> Modified:
> branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
> ===================================================================
> ---
> branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
> 2009-01-09 16:08:47 UTC (rev 18432)
> +++
> branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
> 2009-01-09 18:32:33 UTC (rev 18433)
> @@ -709,6 +709,10 @@
> >
> </File>
> <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna_pose.c"
> + >
> + </File>
> + <File
>
> RelativePath="..\..\..\source\blender\makesrna\intern\rna_property.c"
> >
> </File>
>
> Modified:
> branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
> ===================================================================
> --- branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
> 2009-01-09 16:08:47 UTC (rev 18432)
> +++ branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
> 2009-01-09 18:32:33 UTC (rev 18433)
> @@ -167,10 +167,182 @@
>
> UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
> <File
> -
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.c"
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_action_gen.c"
> >
> </File>
> <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_actuator_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_armature_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_brush_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_camera_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_cloth_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_color_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_constraint_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_controller_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_curve_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_fluidsim_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_group_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_ID_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_image_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_ipo_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_key_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_lamp_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_lattice_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_main_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_material_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_mesh_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_meta_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_modifier_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_nodetree_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_object_force_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_object_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_packedfile_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_particle_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_pose_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_property_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_radio_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_rna_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_scene_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_screen_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_scriptlink_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_sensor_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_sequence_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_sound_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_text_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_texture_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_userdef_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_vfont_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_wm_gen.c"
> + >
> + </File>
> + <File
> +
> RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_world_gen.c"
> + >
> + </File>
> + <File
>
> RelativePath="..\..\..\source\blender\makesrna\intern\rna_access.c"
> >
> </File>
>
> Modified: branches/bmesh/blender/source/Makefile
> ===================================================================
> --- branches/bmesh/blender/source/Makefile 2009-01-09 16:08:47 UTC
> (rev 18432)
> +++ branches/bmesh/blender/source/Makefile 2009-01-09 18:32:33 UTC
> (rev 18433)
> @@ -237,8 +237,8 @@
> PULIB += $(OCGDIR)/blender/ed_view3d/libed_view3d.a
> PULIB += $(OCGDIR)/blender/ed_interface/libed_interface.a
> PULIB += $(OCGDIR)/blender/ed_object/libed_object.a
> +PULIB += $(OCGDIR)/blender/ed_armature/libed_armature.a
> PULIB += $(OCGDIR)/blender/ed_mesh/libed_mesh.a
>
> @@ Diff output truncated at 10240 characters. @@
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.blender.org/pipermail/bf-blender-cvs/attachments/20090109/5a26cab4/attachment.html>
More information about the Bf-blender-cvs
mailing list