[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24256] branches/soc-2009-chingachgook: Merge from trunk -r 24182:24247.

Arystanbek Dyussenov arystan.d at gmail.com
Mon Nov 2 18:35:24 CET 2009


Revision: 24256
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24256
Author:   kazanbas
Date:     2009-11-02 18:35:23 +0100 (Mon, 02 Nov 2009)

Log Message:
-----------
Merge from trunk -r 24182:24247. Skipped change 24182 (merge of this branch into trunk).

Modified Paths:
--------------
    branches/soc-2009-chingachgook/CMakeLists.txt
    branches/soc-2009-chingachgook/config/darwin-config.py
    branches/soc-2009-chingachgook/config/win32-mingw-config.py
    branches/soc-2009-chingachgook/config/win32-vc-config.py
    branches/soc-2009-chingachgook/intern/ghost/SConscript
    branches/soc-2009-chingachgook/projectfiles_vc9/blender/blender.sln
    branches/soc-2009-chingachgook/projectfiles_vc9/blender/blender.vcproj
    branches/soc-2009-chingachgook/projectfiles_vc9/blender/windowmanager/windowmanager.vcproj
    branches/soc-2009-chingachgook/release/datafiles/blenderbuttons
    branches/soc-2009-chingachgook/release/datafiles/datatoc.py
    branches/soc-2009-chingachgook/release/scripts/io/add_mesh_torus.py
    branches/soc-2009-chingachgook/release/scripts/io/engine_render_pov.py
    branches/soc-2009-chingachgook/release/scripts/io/export_3ds.py
    branches/soc-2009-chingachgook/release/scripts/io/export_fbx.py
    branches/soc-2009-chingachgook/release/scripts/io/export_mdd.py
    branches/soc-2009-chingachgook/release/scripts/io/export_obj.py
    branches/soc-2009-chingachgook/release/scripts/io/export_ply.py
    branches/soc-2009-chingachgook/release/scripts/io/export_x3d.py
    branches/soc-2009-chingachgook/release/scripts/io/import_3ds.py
    branches/soc-2009-chingachgook/release/scripts/io/import_obj.py
    branches/soc-2009-chingachgook/release/scripts/io/mesh_skin.py
    branches/soc-2009-chingachgook/release/scripts/io/netrender/__init__.py
    branches/soc-2009-chingachgook/release/scripts/io/netrender/balancing.py
    branches/soc-2009-chingachgook/release/scripts/io/netrender/client.py
    branches/soc-2009-chingachgook/release/scripts/io/netrender/master.py
    branches/soc-2009-chingachgook/release/scripts/io/netrender/master_html.py
    branches/soc-2009-chingachgook/release/scripts/io/netrender/model.py
    branches/soc-2009-chingachgook/release/scripts/io/netrender/operators.py
    branches/soc-2009-chingachgook/release/scripts/io/netrender/slave.py
    branches/soc-2009-chingachgook/release/scripts/io/netrender/ui.py
    branches/soc-2009-chingachgook/release/scripts/io/netrender/utils.py
    branches/soc-2009-chingachgook/release/scripts/modules/bpy_ext/Object.py
    branches/soc-2009-chingachgook/release/scripts/modules/bpy_ext/__init__.py
    branches/soc-2009-chingachgook/release/scripts/modules/bpy_ops.py
    branches/soc-2009-chingachgook/release/scripts/modules/bpy_sys.py
    branches/soc-2009-chingachgook/release/scripts/modules/dynamic_menu.py
    branches/soc-2009-chingachgook/release/scripts/templates/gamelogic.py
    branches/soc-2009-chingachgook/release/scripts/templates/gamelogic_basic.py
    branches/soc-2009-chingachgook/release/scripts/templates/gamelogic_module.py
    branches/soc-2009-chingachgook/release/scripts/templates/operator.py
    branches/soc-2009-chingachgook/release/scripts/templates/operator_simple.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_buttons.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_console.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_filebrowser.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_image.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_info.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_logic.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_node.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_outliner.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_sequencer.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_text.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_time.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_userpref.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_view3d.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2009-chingachgook/release/test/rna_array.py
    branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_armature.h
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/action.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/armature.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/constraint.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/ipo.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/multires.c
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/arithb.c
    branches/soc-2009-chingachgook/source/blender/blenloader/intern/readfile.c
    branches/soc-2009-chingachgook/source/blender/blenloader/intern/writefile.c
    branches/soc-2009-chingachgook/source/blender/collada/CMakeLists.txt
    branches/soc-2009-chingachgook/source/blender/editors/armature/armature_intern.h
    branches/soc-2009-chingachgook/source/blender/editors/armature/armature_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/armature/poseobject.c
    branches/soc-2009-chingachgook/source/blender/editors/curve/editfont.c
    branches/soc-2009-chingachgook/source/blender/editors/datafiles/B.blend.c
    branches/soc-2009-chingachgook/source/blender/editors/datafiles/blenderbuttons.c
    branches/soc-2009-chingachgook/source/blender/editors/include/ED_object.h
    branches/soc-2009-chingachgook/source/blender/editors/include/UI_icons.h
    branches/soc-2009-chingachgook/source/blender/editors/interface/interface_handlers.c
    branches/soc-2009-chingachgook/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2009-chingachgook/source/blender/editors/object/object_add.c
    branches/soc-2009-chingachgook/source/blender/editors/object/object_constraint.c
    branches/soc-2009-chingachgook/source/blender/editors/object/object_group.c
    branches/soc-2009-chingachgook/source/blender/editors/object/object_intern.h
    branches/soc-2009-chingachgook/source/blender/editors/object/object_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2009-chingachgook/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2009-chingachgook/source/blender/editors/space_node/drawnode.c
    branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2009-chingachgook/source/blender/editors/transform/transform.c
    branches/soc-2009-chingachgook/source/blender/editors/transform/transform_conversions.c
    branches/soc-2009-chingachgook/source/blender/editors/transform/transform_generics.c
    branches/soc-2009-chingachgook/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2009-chingachgook/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/soc-2009-chingachgook/source/blender/imbuf/CMakeLists.txt
    branches/soc-2009-chingachgook/source/blender/imbuf/SConscript
    branches/soc-2009-chingachgook/source/blender/imbuf/intern/dynlibtiff.c
    branches/soc-2009-chingachgook/source/blender/imbuf/intern/imbuf_cocoa.m
    branches/soc-2009-chingachgook/source/blender/imbuf/intern/readimage.c
    branches/soc-2009-chingachgook/source/blender/imbuf/intern/writeimage.c
    branches/soc-2009-chingachgook/source/blender/makesdna/DNA_action_types.h
    branches/soc-2009-chingachgook/source/blender/makesdna/DNA_armature_types.h
    branches/soc-2009-chingachgook/source/blender/makesdna/DNA_constraint_types.h
    branches/soc-2009-chingachgook/source/blender/makesdna/DNA_object_types.h
    branches/soc-2009-chingachgook/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2009-chingachgook/source/blender/makesrna/RNA_access.h
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_access.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_material.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_object.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_render.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_space.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2009-chingachgook/source/blender/python/epy_doc_gen.py
    branches/soc-2009-chingachgook/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2009-chingachgook/source/blender/python/intern/bpy_rna.c
    branches/soc-2009-chingachgook/source/blender/python/intern/bpy_rna.h
    branches/soc-2009-chingachgook/source/blender/python/rna_dump.py
    branches/soc-2009-chingachgook/source/blender/python/simple_enum_gen.py
    branches/soc-2009-chingachgook/source/blender/windowmanager/SConscript
    branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2009-chingachgook/source/creator/creator.c
    branches/soc-2009-chingachgook/source/tools/MakeCursor.py
    branches/soc-2009-chingachgook/tools/btools.py

Added Paths:
-----------
    branches/soc-2009-chingachgook/projectfiles_vc9/blender/collada/
    branches/soc-2009-chingachgook/projectfiles_vc9/blender/collada/BF_collada.vcproj
    branches/soc-2009-chingachgook/release/scripts/io/vertexpaint_dirt.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_data_armature.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_data_bone.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_data_camera.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_data_curve.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_data_empty.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_data_lamp.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_data_lattice.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_data_mesh.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_data_metaball.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_data_modifier.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_data_text.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_game.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_material.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_object.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_object_constraint.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_particle.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_physics_cloth.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_physics_common.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_physics_field.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_physics_fluid.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_physics_smoke.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_physics_softbody.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_render.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_scene.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_texture.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_world.py

Removed Paths:
-------------
    branches/soc-2009-chingachgook/projectfiles_vc9/blender/collada/BF_collada.vcproj
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_data_armature.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_data_bone.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_data_camera.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_data_curve.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_data_empty.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_data_lamp.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_data_lattice.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_data_mesh.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_data_metaball.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_data_modifier.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_data_text.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_game.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_material.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_object.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_object_constraint.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_particle.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_physics_cloth.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_physics_common.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_physics_field.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_physics_fluid.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_physics_smoke.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_physics_softbody.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_render.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_scene.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_texture.py
    branches/soc-2009-chingachgook/release/scripts/ui/buttons_world.py

Property Changed:
----------------
    branches/soc-2009-chingachgook/source/blender/collada/DocumentExporter.cpp
    branches/soc-2009-chingachgook/source/blender/collada/DocumentExporter.h
    branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.cpp
    branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.h
    branches/soc-2009-chingachgook/source/blender/collada/SConscript
    branches/soc-2009-chingachgook/source/blender/collada/collada.cpp
    branches/soc-2009-chingachgook/source/blender/collada/collada.h
    branches/soc-2009-chingachgook/source/blender/collada/collada_internal.h
    branches/soc-2009-chingachgook/source/blender/editors/interface/interface_handlers.c

Modified: branches/soc-2009-chingachgook/CMakeLists.txt
===================================================================
--- branches/soc-2009-chingachgook/CMakeLists.txt	2009-11-02 17:26:40 UTC (rev 24255)
+++ branches/soc-2009-chingachgook/CMakeLists.txt	2009-11-02 17:35:23 UTC (rev 24256)
@@ -91,7 +91,7 @@
 	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
-IF (WITH_OPENCOLLADA)
+IF (WITH_OPENCOLLADA AND NOT APPLE)
 SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
 SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
 SET(OPENCOLLADA_LIB OpenCollada)
@@ -101,9 +101,8 @@
 SET(EXPAT /usr CACHE FILEPATH "Expat Directory")
 SET(EXPAT_LIBPATH ${EXPAT}/lib)
 SET(EXPAT_LIB expat)
+ENDIF (WITH_OPENCOLLADA AND NOT APPLE)
 
-ENDIF (WITH_OPENCOLLADA)
-
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
 # On Unix: 
 #   cmake -D PYTHON_LIB=/usr/local/lib/python2.3/config/libpython2.3.so -D PYTHON_INC=/usr/local/include/python2.3 -D PYTHON_BINARY=/usr/local/bin/python2.3 -G "Unix Makefiles" ../blender
@@ -517,12 +516,28 @@
 	SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
 	SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
 	ENDIF (WITH_COCOA)
+
 	IF(WITH_OPENMP)
 		SET(LLIBS "${LLIBS} -lgomp ")
 		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
 	ENDIF(WITH_OPENMP)
 
+	IF (WITH_OPENCOLLADA)
+		SET(OPENCOLLADA ${LIBDIR}/opencollada)
+		SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
+		SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
+		SET(OPENCOLLADA_LIB "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2" )
+		#pcre is bundled with openCollada
+		#SET(PCRE ${LIBDIR}/pcre)
+		#SET(PCRE_LIBPATH ${PCRE}/lib)
+		SET(PCRE_LIB pcre)
+		#native OSX libxml2 is used
+		#SET(EXPAT ${LIBDIR}/expat)
+		#SET(EXPAT_LIBPATH ${EXPAT}/lib)
+		#SET(EXPAT_LIB expat)
+	ENDIF (WITH_OPENCOLLADA)
+
 	SET(SDL ${LIBDIR}/sdl)
 	SET(SDL_INCLUDE_DIR ${SDL}/include)
 	SET(SDL_LIBRARY SDL)

Modified: branches/soc-2009-chingachgook/config/darwin-config.py
===================================================================
--- branches/soc-2009-chingachgook/config/darwin-config.py	2009-11-02 17:26:40 UTC (rev 24255)
+++ branches/soc-2009-chingachgook/config/darwin-config.py	2009-11-02 17:35:23 UTC (rev 24256)
@@ -246,6 +246,9 @@
 BF_OPENGL_LIBPATH = '/System/Library/Frameworks/OpenGL.framework/Libraries'
 BF_OPENGL_LINKFLAGS = ['-framework', 'OpenGL']
 
+#OpenCollada flags
+WITH_BF_COLLADA = False
+
 #############################################################################
 ###################  various compile settings and flags    ##################
 #############################################################################

Modified: branches/soc-2009-chingachgook/config/win32-mingw-config.py
===================================================================
--- branches/soc-2009-chingachgook/config/win32-mingw-config.py	2009-11-02 17:26:40 UTC (rev 24255)
+++ branches/soc-2009-chingachgook/config/win32-mingw-config.py	2009-11-02 17:35:23 UTC (rev 24256)
@@ -126,6 +126,10 @@
 BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
              '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
              '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
+
+# Disable Collada by default
+WITH_BF_COLLADA = False
+
 ##
 CC = 'gcc'
 CXX = 'g++'

Modified: branches/soc-2009-chingachgook/config/win32-vc-config.py
===================================================================
--- branches/soc-2009-chingachgook/config/win32-vc-config.py	2009-11-02 17:26:40 UTC (rev 24255)
+++ branches/soc-2009-chingachgook/config/win32-vc-config.py	2009-11-02 17:35:23 UTC (rev 24256)
@@ -145,7 +145,7 @@
 
 BF_OPENCOLLADA = LIBDIR + '/opencollada'
 BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'opencollada'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre'
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
 WITH_BF_STATICOPENGL = False

Modified: branches/soc-2009-chingachgook/intern/ghost/SConscript
===================================================================
--- branches/soc-2009-chingachgook/intern/ghost/SConscript	2009-11-02 17:26:40 UTC (rev 24255)
+++ branches/soc-2009-chingachgook/intern/ghost/SConscript	2009-11-02 17:35:23 UTC (rev 24256)
@@ -10,16 +10,7 @@
 if window_system == 'darwin':
 	sources += env.Glob('intern/*.mm')
 
-#if env['WITH_GHOST_COCOA'] == True:
-#	env.Append(CFLAGS=['-DGHOST_COCOA']) 
-#	env.Append(CXXFLAGS=['-DGHOST_COCOA'])
-#	env.Append(CPPFLAGS=['-DGHOST_COCOA'])
 
-#defs = ''
-#if env['WITH_GHOST_COCOA']:
-#	defs += 'GHOST_COCOA'
-# maybe we need it later
-
 pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_Window']
 
 if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6', 'irix6'):

Modified: branches/soc-2009-chingachgook/projectfiles_vc9/blender/blender.sln
===================================================================
--- branches/soc-2009-chingachgook/projectfiles_vc9/blender/blender.sln	2009-11-02 17:26:40 UTC (rev 24255)
+++ branches/soc-2009-chingachgook/projectfiles_vc9/blender/blender.sln	2009-11-02 17:35:23 UTC (rev 24256)
@@ -7,6 +7,7 @@
 		{6E24BF09-9653-4166-A871-F65CC9E98A9B} = {6E24BF09-9653-4166-A871-F65CC9E98A9B}
 		{A90C4918-4B21-4277-93BD-AF65F30951D9} = {A90C4918-4B21-4277-93BD-AF65F30951D9}
 		{FB88301F-F725-401B-ACD7-D2ABBF333B71} = {FB88301F-F725-401B-ACD7-D2ABBF333B71}
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2} = {76D3102B-7DD2-8BA1-034A-8B19FE2897C2}
 		{BAAE3F2B-BCF8-4E84-B8BA-CFB2D64945FE} = {BAAE3F2B-BCF8-4E84-B8BA-CFB2D64945FE}
 		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8} = {C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}
 		{D1A9312F-4557-4982-A0F4-4D08508235F4} = {D1A9312F-4557-4982-A0F4-4D08508235F4}
@@ -294,6 +295,7 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WM_windowmanager", "windowmanager\windowmanager.vcproj", "{884D8731-654C-4C7F-9A75-8F37A305BE1E}"
 	ProjectSection(ProjectDependencies) = postProject
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2} = {76D3102B-7DD2-8BA1-034A-8B19FE2897C2}
 		{DFE7F3E3-E62A-4677-B666-DF0DDF70C359} = {DFE7F3E3-E62A-4677-B666-DF0DDF70C359}
 	EndProjectSection
 EndProject
@@ -332,6 +334,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BRE_raytrace", "render\BRE_raytrace.vcproj", "{37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BF_collada", "collada\BF_collada.vcproj", "{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		3D Plugin Debug|Win32 = 3D Plugin Debug|Win32
@@ -1569,6 +1573,26 @@
 		{37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}.Debug|Win32.Build.0 = Blender Debug|Win32
 		{37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}.Release|Win32.ActiveCfg = Blender Release|Win32
 		{37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}.Release|Win32.Build.0 = Blender Release|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.3D Plugin Debug|Win32.ActiveCfg = Blender Release|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.3D Plugin Debug|Win32.Build.0 = Blender Release|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.3D Plugin Release|Win32.ActiveCfg = Blender Release|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.3D Plugin Release|Win32.Build.0 = Blender Release|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.3DPlugin Debug|Win32.ActiveCfg = Blender Release|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.3DPlugin Debug|Win32.Build.0 = Blender Release|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.3DPlugin Release|Win32.ActiveCfg = Blender Release|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.3DPlugin Release|Win32.Build.0 = Blender Release|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.Blender Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.Blender Debug|Win32.Build.0 = Blender Debug|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.Blender Release|Win32.ActiveCfg = Blender Release|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.Blender Release|Win32.Build.0 = Blender Release|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.BlenderPlayer Debug|Win32.ActiveCfg = Blender Release|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.BlenderPlayer Debug|Win32.Build.0 = Blender Release|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.BlenderPlayer Release|Win32.ActiveCfg = Blender Release|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.BlenderPlayer Release|Win32.Build.0 = Blender Release|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.Debug|Win32.Build.0 = Blender Debug|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.Release|Win32.ActiveCfg = Blender Release|Win32
+		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.Release|Win32.Build.0 = Blender Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: branches/soc-2009-chingachgook/projectfiles_vc9/blender/blender.vcproj
===================================================================
--- branches/soc-2009-chingachgook/projectfiles_vc9/blender/blender.vcproj	2009-11-02 17:26:40 UTC (rev 24255)
+++ branches/soc-2009-chingachgook/projectfiles_vc9/blender/blender.vcproj	2009-11-02 17:35:23 UTC (rev 24256)
@@ -74,12 +74,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="libsamplerate.lib SDL.lib freetype2ST.lib gnu_gettext.lib qtmlClient.lib OpenAL32.lib wrap_oal.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib python31.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half.lib Iex.lib IlmImf.lib Imath.lib IlmThread.lib avcodec-52.lib avformat-52.lib avutil-50.lib swscale-0.lib avdevice-52.lib libsndfile-1.lib"

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list