[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24258] branches/sculpt25: Sculpt: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24152 :24257
Brecht Van Lommel
brecht at blender.org
Mon Nov 2 19:57:00 CET 2009
Revision: 24258
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24258
Author: blendix
Date: 2009-11-02 19:56:56 +0100 (Mon, 02 Nov 2009)
Log Message:
-----------
Sculpt: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24152:24257
Modified Paths:
--------------
branches/sculpt25/CMake/macros.cmake
branches/sculpt25/CMakeLists.txt
branches/sculpt25/SConstruct
branches/sculpt25/config/darwin-config.py
branches/sculpt25/config/linux2-config.py
branches/sculpt25/config/win32-mingw-config.py
branches/sculpt25/config/win32-vc-config.py
branches/sculpt25/config/win64-vc-config.py
branches/sculpt25/intern/ghost/SConscript
branches/sculpt25/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/sculpt25/intern/ghost/intern/GHOST_SystemWin32.h
branches/sculpt25/projectfiles_vc9/blender/blender.sln
branches/sculpt25/projectfiles_vc9/blender/blender.vcproj
branches/sculpt25/projectfiles_vc9/blender/windowmanager/windowmanager.vcproj
branches/sculpt25/release/datafiles/blenderbuttons
branches/sculpt25/release/datafiles/datatoc.py
branches/sculpt25/release/scripts/io/add_mesh_torus.py
branches/sculpt25/release/scripts/io/engine_render_pov.py
branches/sculpt25/release/scripts/io/export_3ds.py
branches/sculpt25/release/scripts/io/export_fbx.py
branches/sculpt25/release/scripts/io/export_mdd.py
branches/sculpt25/release/scripts/io/export_obj.py
branches/sculpt25/release/scripts/io/export_ply.py
branches/sculpt25/release/scripts/io/export_x3d.py
branches/sculpt25/release/scripts/io/import_3ds.py
branches/sculpt25/release/scripts/io/import_obj.py
branches/sculpt25/release/scripts/io/mesh_skin.py
branches/sculpt25/release/scripts/io/netrender/__init__.py
branches/sculpt25/release/scripts/io/netrender/balancing.py
branches/sculpt25/release/scripts/io/netrender/client.py
branches/sculpt25/release/scripts/io/netrender/master.py
branches/sculpt25/release/scripts/io/netrender/master_html.py
branches/sculpt25/release/scripts/io/netrender/model.py
branches/sculpt25/release/scripts/io/netrender/operators.py
branches/sculpt25/release/scripts/io/netrender/slave.py
branches/sculpt25/release/scripts/io/netrender/ui.py
branches/sculpt25/release/scripts/io/netrender/utils.py
branches/sculpt25/release/scripts/modules/bpy_ext/Object.py
branches/sculpt25/release/scripts/modules/bpy_ext/__init__.py
branches/sculpt25/release/scripts/modules/bpy_ops.py
branches/sculpt25/release/scripts/modules/bpy_sys.py
branches/sculpt25/release/scripts/modules/dynamic_menu.py
branches/sculpt25/release/scripts/ui/space_buttons.py
branches/sculpt25/release/scripts/ui/space_console.py
branches/sculpt25/release/scripts/ui/space_filebrowser.py
branches/sculpt25/release/scripts/ui/space_image.py
branches/sculpt25/release/scripts/ui/space_info.py
branches/sculpt25/release/scripts/ui/space_logic.py
branches/sculpt25/release/scripts/ui/space_node.py
branches/sculpt25/release/scripts/ui/space_outliner.py
branches/sculpt25/release/scripts/ui/space_sequencer.py
branches/sculpt25/release/scripts/ui/space_text.py
branches/sculpt25/release/scripts/ui/space_time.py
branches/sculpt25/release/scripts/ui/space_userpref.py
branches/sculpt25/release/scripts/ui/space_view3d.py
branches/sculpt25/release/scripts/ui/space_view3d_toolbar.py
branches/sculpt25/release/test/rna_array.py
branches/sculpt25/source/blender/CMakeLists.txt
branches/sculpt25/source/blender/SConscript
branches/sculpt25/source/blender/blenkernel/BKE_armature.h
branches/sculpt25/source/blender/blenkernel/intern/action.c
branches/sculpt25/source/blender/blenkernel/intern/armature.c
branches/sculpt25/source/blender/blenkernel/intern/blender.c
branches/sculpt25/source/blender/blenkernel/intern/constraint.c
branches/sculpt25/source/blender/blenkernel/intern/depsgraph.c
branches/sculpt25/source/blender/blenkernel/intern/ipo.c
branches/sculpt25/source/blender/blenkernel/intern/multires.c
branches/sculpt25/source/blender/blenkernel/intern/particle.c
branches/sculpt25/source/blender/blenkernel/intern/sequence.c
branches/sculpt25/source/blender/blenkernel/intern/smoke.c
branches/sculpt25/source/blender/blenlib/BLI_arithb.h
branches/sculpt25/source/blender/blenlib/intern/arithb.c
branches/sculpt25/source/blender/blenloader/intern/readfile.c
branches/sculpt25/source/blender/blenloader/intern/writefile.c
branches/sculpt25/source/blender/editors/animation/keyingsets.c
branches/sculpt25/source/blender/editors/armature/armature_intern.h
branches/sculpt25/source/blender/editors/armature/armature_ops.c
branches/sculpt25/source/blender/editors/armature/editarmature.c
branches/sculpt25/source/blender/editors/armature/poseobject.c
branches/sculpt25/source/blender/editors/curve/editcurve.c
branches/sculpt25/source/blender/editors/curve/editfont.c
branches/sculpt25/source/blender/editors/datafiles/B.blend.c
branches/sculpt25/source/blender/editors/datafiles/blenderbuttons.c
branches/sculpt25/source/blender/editors/include/ED_object.h
branches/sculpt25/source/blender/editors/include/UI_icons.h
branches/sculpt25/source/blender/editors/interface/interface_widgets.c
branches/sculpt25/source/blender/editors/mesh/editmesh_add.c
branches/sculpt25/source/blender/editors/mesh/mesh_ops.c
branches/sculpt25/source/blender/editors/metaball/mball_edit.c
branches/sculpt25/source/blender/editors/object/object_add.c
branches/sculpt25/source/blender/editors/object/object_constraint.c
branches/sculpt25/source/blender/editors/object/object_group.c
branches/sculpt25/source/blender/editors/object/object_intern.h
branches/sculpt25/source/blender/editors/object/object_ops.c
branches/sculpt25/source/blender/editors/screen/screen_context.c
branches/sculpt25/source/blender/editors/sculpt_paint/paint_vertex.c
branches/sculpt25/source/blender/editors/space_buttons/buttons_header.c
branches/sculpt25/source/blender/editors/space_node/drawnode.c
branches/sculpt25/source/blender/editors/space_sequencer/sequencer_edit.c
branches/sculpt25/source/blender/editors/space_sequencer/sequencer_intern.h
branches/sculpt25/source/blender/editors/space_sequencer/sequencer_ops.c
branches/sculpt25/source/blender/editors/space_view3d/drawarmature.c
branches/sculpt25/source/blender/editors/space_view3d/space_view3d.c
branches/sculpt25/source/blender/editors/space_view3d/view3d_edit.c
branches/sculpt25/source/blender/editors/space_view3d/view3d_header.c
branches/sculpt25/source/blender/editors/space_view3d/view3d_snap.c
branches/sculpt25/source/blender/editors/space_view3d/view3d_view.c
branches/sculpt25/source/blender/editors/transform/transform.c
branches/sculpt25/source/blender/editors/transform/transform.h
branches/sculpt25/source/blender/editors/transform/transform_conversions.c
branches/sculpt25/source/blender/editors/transform/transform_generics.c
branches/sculpt25/source/blender/editors/transform/transform_manipulator.c
branches/sculpt25/source/blender/editors/transform/transform_orientations.c
branches/sculpt25/source/blender/editors/uvedit/uvedit_ops.c
branches/sculpt25/source/blender/ikplugin/intern/iksolver_plugin.c
branches/sculpt25/source/blender/imbuf/CMakeLists.txt
branches/sculpt25/source/blender/imbuf/SConscript
branches/sculpt25/source/blender/imbuf/intern/dynlibtiff.c
branches/sculpt25/source/blender/imbuf/intern/readimage.c
branches/sculpt25/source/blender/imbuf/intern/writeimage.c
branches/sculpt25/source/blender/makesdna/DNA_action_types.h
branches/sculpt25/source/blender/makesdna/DNA_armature_types.h
branches/sculpt25/source/blender/makesdna/DNA_constraint_types.h
branches/sculpt25/source/blender/makesdna/DNA_object_types.h
branches/sculpt25/source/blender/makesdna/DNA_scene_types.h
branches/sculpt25/source/blender/makesrna/RNA_access.h
branches/sculpt25/source/blender/makesrna/intern/rna_access.c
branches/sculpt25/source/blender/makesrna/intern/rna_constraint.c
branches/sculpt25/source/blender/makesrna/intern/rna_material.c
branches/sculpt25/source/blender/makesrna/intern/rna_nodetree.c
branches/sculpt25/source/blender/makesrna/intern/rna_object.c
branches/sculpt25/source/blender/makesrna/intern/rna_object_force.c
branches/sculpt25/source/blender/makesrna/intern/rna_render.c
branches/sculpt25/source/blender/makesrna/intern/rna_scene.c
branches/sculpt25/source/blender/makesrna/intern/rna_space.c
branches/sculpt25/source/blender/makesrna/intern/rna_texture.c
branches/sculpt25/source/blender/makesrna/intern/rna_ui.c
branches/sculpt25/source/blender/makesrna/intern/rna_userdef.c
branches/sculpt25/source/blender/makesrna/intern/rna_wm.c
branches/sculpt25/source/blender/python/epy_doc_gen.py
branches/sculpt25/source/blender/python/intern/bpy_operator_wrap.c
branches/sculpt25/source/blender/python/intern/bpy_rna.c
branches/sculpt25/source/blender/python/intern/bpy_rna.h
branches/sculpt25/source/blender/python/rna_dump.py
branches/sculpt25/source/blender/python/simple_enum_gen.py
branches/sculpt25/source/blender/windowmanager/CMakeLists.txt
branches/sculpt25/source/blender/windowmanager/SConscript
branches/sculpt25/source/blender/windowmanager/intern/wm_operators.c
branches/sculpt25/source/creator/CMakeLists.txt
branches/sculpt25/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp
branches/sculpt25/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.h
branches/sculpt25/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/sculpt25/source/tools/MakeCursor.py
branches/sculpt25/tools/Blender.py
branches/sculpt25/tools/btools.py
Added Paths:
-----------
branches/sculpt25/projectfiles_vc9/blender/collada/
branches/sculpt25/projectfiles_vc9/blender/collada/BF_collada.vcproj
branches/sculpt25/release/scripts/io/vertexpaint_dirt.py
branches/sculpt25/release/scripts/modules/console/
branches/sculpt25/release/scripts/modules/console/__init__.py
branches/sculpt25/release/scripts/modules/console/complete_import.py
branches/sculpt25/release/scripts/modules/console/complete_namespace.py
branches/sculpt25/release/scripts/modules/console/intellisense.py
branches/sculpt25/release/scripts/templates/
branches/sculpt25/release/scripts/templates/gamelogic.py
branches/sculpt25/release/scripts/templates/gamelogic_basic.py
branches/sculpt25/release/scripts/templates/gamelogic_module.py
branches/sculpt25/release/scripts/templates/operator.py
branches/sculpt25/release/scripts/templates/operator_simple.py
branches/sculpt25/release/scripts/ui/properties_data_armature.py
branches/sculpt25/release/scripts/ui/properties_data_bone.py
branches/sculpt25/release/scripts/ui/properties_data_camera.py
branches/sculpt25/release/scripts/ui/properties_data_curve.py
branches/sculpt25/release/scripts/ui/properties_data_empty.py
branches/sculpt25/release/scripts/ui/properties_data_lamp.py
branches/sculpt25/release/scripts/ui/properties_data_lattice.py
branches/sculpt25/release/scripts/ui/properties_data_mesh.py
branches/sculpt25/release/scripts/ui/properties_data_metaball.py
branches/sculpt25/release/scripts/ui/properties_data_modifier.py
branches/sculpt25/release/scripts/ui/properties_data_text.py
branches/sculpt25/release/scripts/ui/properties_game.py
branches/sculpt25/release/scripts/ui/properties_material.py
branches/sculpt25/release/scripts/ui/properties_object.py
branches/sculpt25/release/scripts/ui/properties_object_constraint.py
branches/sculpt25/release/scripts/ui/properties_particle.py
branches/sculpt25/release/scripts/ui/properties_physics_cloth.py
branches/sculpt25/release/scripts/ui/properties_physics_common.py
branches/sculpt25/release/scripts/ui/properties_physics_field.py
branches/sculpt25/release/scripts/ui/properties_physics_fluid.py
branches/sculpt25/release/scripts/ui/properties_physics_smoke.py
branches/sculpt25/release/scripts/ui/properties_physics_softbody.py
branches/sculpt25/release/scripts/ui/properties_render.py
branches/sculpt25/release/scripts/ui/properties_scene.py
branches/sculpt25/release/scripts/ui/properties_texture.py
branches/sculpt25/release/scripts/ui/properties_world.py
branches/sculpt25/source/blender/collada/
branches/sculpt25/source/blender/collada/CMakeLists.txt
branches/sculpt25/source/blender/collada/DocumentExporter.cpp
branches/sculpt25/source/blender/collada/DocumentExporter.h
branches/sculpt25/source/blender/collada/DocumentImporter.cpp
branches/sculpt25/source/blender/collada/DocumentImporter.h
branches/sculpt25/source/blender/collada/SConscript
branches/sculpt25/source/blender/collada/collada.cpp
branches/sculpt25/source/blender/collada/collada.h
branches/sculpt25/source/blender/collada/collada_internal.h
branches/sculpt25/source/blender/imbuf/intern/IMB_cocoa.h
branches/sculpt25/source/blender/imbuf/intern/imbuf_cocoa.m
Removed Paths:
-------------
branches/sculpt25/projectfiles_vc9/blender/collada/BF_collada.vcproj
branches/sculpt25/release/scripts/modules/autocomplete.py
branches/sculpt25/release/scripts/modules/console/__init__.py
branches/sculpt25/release/scripts/modules/console/complete_import.py
branches/sculpt25/release/scripts/modules/console/complete_namespace.py
branches/sculpt25/release/scripts/modules/console/intellisense.py
branches/sculpt25/release/scripts/templates/gamelogic.py
branches/sculpt25/release/scripts/templates/gamelogic_basic.py
branches/sculpt25/release/scripts/templates/gamelogic_module.py
branches/sculpt25/release/scripts/templates/operator.py
branches/sculpt25/release/scripts/templates/operator_simple.py
branches/sculpt25/release/scripts/ui/buttons_data_armature.py
branches/sculpt25/release/scripts/ui/buttons_data_bone.py
branches/sculpt25/release/scripts/ui/buttons_data_camera.py
branches/sculpt25/release/scripts/ui/buttons_data_curve.py
branches/sculpt25/release/scripts/ui/buttons_data_empty.py
branches/sculpt25/release/scripts/ui/buttons_data_lamp.py
branches/sculpt25/release/scripts/ui/buttons_data_lattice.py
branches/sculpt25/release/scripts/ui/buttons_data_mesh.py
branches/sculpt25/release/scripts/ui/buttons_data_metaball.py
branches/sculpt25/release/scripts/ui/buttons_data_modifier.py
branches/sculpt25/release/scripts/ui/buttons_data_text.py
branches/sculpt25/release/scripts/ui/buttons_game.py
branches/sculpt25/release/scripts/ui/buttons_material.py
branches/sculpt25/release/scripts/ui/buttons_object.py
branches/sculpt25/release/scripts/ui/buttons_object_constraint.py
branches/sculpt25/release/scripts/ui/buttons_particle.py
branches/sculpt25/release/scripts/ui/buttons_physics_cloth.py
branches/sculpt25/release/scripts/ui/buttons_physics_common.py
branches/sculpt25/release/scripts/ui/buttons_physics_field.py
branches/sculpt25/release/scripts/ui/buttons_physics_fluid.py
branches/sculpt25/release/scripts/ui/buttons_physics_smoke.py
branches/sculpt25/release/scripts/ui/buttons_physics_softbody.py
branches/sculpt25/release/scripts/ui/buttons_render.py
branches/sculpt25/release/scripts/ui/buttons_scene.py
branches/sculpt25/release/scripts/ui/buttons_texture.py
branches/sculpt25/release/scripts/ui/buttons_world.py
branches/sculpt25/source/blender/collada/CMakeLists.txt
branches/sculpt25/source/blender/collada/DocumentExporter.cpp
branches/sculpt25/source/blender/collada/DocumentExporter.h
branches/sculpt25/source/blender/collada/DocumentImporter.cpp
branches/sculpt25/source/blender/collada/DocumentImporter.h
branches/sculpt25/source/blender/collada/SConscript
branches/sculpt25/source/blender/collada/collada.cpp
branches/sculpt25/source/blender/collada/collada.h
branches/sculpt25/source/blender/collada/collada_internal.h
Property Changed:
----------------
branches/sculpt25/source/blender/editors/interface/interface_handlers.c
Modified: branches/sculpt25/CMake/macros.cmake
===================================================================
--- branches/sculpt25/CMake/macros.cmake 2009-11-02 18:47:03 UTC (rev 24257)
+++ branches/sculpt25/CMake/macros.cmake 2009-11-02 18:56:56 UTC (rev 24258)
@@ -76,6 +76,11 @@
IF(WITH_FFTW3)
LINK_DIRECTORIES(${FFTW3_LIBPATH})
ENDIF(WITH_FFTW3)
+ IF(WITH_OPENCOLLADA)
+ LINK_DIRECTORIES(${OPENCOLLADA_LIBPATH})
+ LINK_DIRECTORIES(${PCRE_LIBPATH})
+ LINK_DIRECTORIES(${EXPAT_LIBPATH})
+ ENDIF(WITH_OPENCOLLADA)
IF(WIN32)
LINK_DIRECTORIES(${PTHREADS_LIBPATH})
@@ -135,6 +140,11 @@
IF(WITH_FFMPEG)
TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB})
ENDIF(WITH_FFMPEG)
+ IF(WITH_OPENCOLLADA)
+ TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
+ TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
+ TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
+ ENDIF(WITH_OPENCOLLADA)
IF(WIN32)
TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
ENDIF(WIN32)
Modified: branches/sculpt25/CMakeLists.txt
===================================================================
--- branches/sculpt25/CMakeLists.txt 2009-11-02 18:47:03 UTC (rev 24257)
+++ branches/sculpt25/CMakeLists.txt 2009-11-02 18:56:56 UTC (rev 24258)
@@ -80,6 +80,7 @@
OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
OPTION(WITH_BUILDINFO "Include extra build details" ON)
OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
+OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF)
IF (APPLE)
OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
@@ -90,6 +91,18 @@
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
+IF (WITH_OPENCOLLADA AND NOT APPLE)
+SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
+SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
+SET(OPENCOLLADA_LIB OpenCollada)
+SET(PCRE /usr CACHE FILEPATH "PCRE Directory")
+SET(PCRE_LIBPATH ${PCRE}/lib)
+SET(PCRE_LIB pcre)
+SET(EXPAT /usr CACHE FILEPATH "Expat Directory")
+SET(EXPAT_LIBPATH ${EXPAT}/lib)
+SET(EXPAT_LIB expat)
+ENDIF (WITH_OPENCOLLADA AND NOT APPLE)
+
# 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
@@ -503,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/sculpt25/SConstruct
===================================================================
--- branches/sculpt25/SConstruct 2009-11-02 18:47:03 UTC (rev 24257)
+++ branches/sculpt25/SConstruct 2009-11-02 18:56:56 UTC (rev 24258)
@@ -217,6 +217,11 @@
env.Append(CPPFLAGS=['-fopenmp'])
env.Append(CXXFLAGS=['-fopenmp'])
+if env['WITH_GHOST_COCOA'] == True:
+ env.Append(CFLAGS=['-DGHOST_COCOA'])
+ env.Append(CXXFLAGS=['-DGHOST_COCOA'])
+ env.Append(CPPFLAGS=['-DGHOST_COCOA'])
+
#check for additional debug libnames
if env.has_key('BF_DEBUG_LIBS'):
Modified: branches/sculpt25/config/darwin-config.py
===================================================================
--- branches/sculpt25/config/darwin-config.py 2009-11-02 18:47:03 UTC (rev 24257)
+++ branches/sculpt25/config/darwin-config.py 2009-11-02 18:56:56 UTC (rev 24258)
@@ -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/sculpt25/config/linux2-config.py
===================================================================
--- branches/sculpt25/config/linux2-config.py 2009-11-02 18:47:03 UTC (rev 24257)
+++ branches/sculpt25/config/linux2-config.py 2009-11-02 18:56:56 UTC (rev 24258)
@@ -151,6 +151,20 @@
BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
+WITH_BF_COLLADA = False
+BF_COLLADA = '#source/blender/collada'
+BF_COLLADA_INC = '${BF_COLLADA}'
+BF_COLLADA_LIB = 'bf_collada'
+BF_OPENCOLLADA = ''
+BF_OPENCOLLADA_LIB = 'OpenCollada'
+BF_OPENCOLLADA_LIBPATH = '/usr/lib'
+BF_PCRE = ''
+BF_PCRE_LIB = 'pcre'
+BF_PCRE_LIBPATH = '/usr/lib'
+BF_EXPAT = '/usr'
+BF_EXPAT_LIB = 'expat'
+BF_EXPAT_LIBPATH = '/usr/lib'
+
##
CC = 'gcc'
CXX = 'g++'
Modified: branches/sculpt25/config/win32-mingw-config.py
===================================================================
--- branches/sculpt25/config/win32-mingw-config.py 2009-11-02 18:47:03 UTC (rev 24257)
+++ branches/sculpt25/config/win32-mingw-config.py 2009-11-02 18:56:56 UTC (rev 24258)
@@ -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/sculpt25/config/win32-vc-config.py
===================================================================
--- branches/sculpt25/config/win32-vc-config.py 2009-11-02 18:47:03 UTC (rev 24257)
+++ branches/sculpt25/config/win32-vc-config.py 2009-11-02 18:56:56 UTC (rev 24258)
@@ -138,6 +138,16 @@
WITH_BF_REDCODE = False
BF_REDCODE_INC = '#extern'
+WITH_BF_COLLADA = False
+BF_COLLADA = '#source/blender/collada'
+BF_COLLADA_INC = '${BF_COLLADA}'
+BF_COLLADA_LIB = 'bf_collada'
+
+BF_OPENCOLLADA = LIBDIR + '/opencollada'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+
WITH_BF_STATICOPENGL = False
BF_OPENGL_INC = '${BF_OPENGL}/include'
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
Modified: branches/sculpt25/config/win64-vc-config.py
===================================================================
--- branches/sculpt25/config/win64-vc-config.py 2009-11-02 18:47:03 UTC (rev 24257)
+++ branches/sculpt25/config/win64-vc-config.py 2009-11-02 18:56:56 UTC (rev 24258)
@@ -151,6 +151,16 @@
WITH_BF_REDCODE = False
BF_REDCODE_INC = '#extern'
+WITH_BF_COLLADA = False
+BF_COLLADA = '#source/blender/collada'
+BF_COLLADA_INC = '${BF_COLLADA}'
+BF_COLLADA_LIB = 'bf_collada'
+
+BF_OPENCOLLADA = LIBDIR + '/opencollada'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
+BF_OPENCOLLADA_LIB = 'opencollada'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+
WITH_BF_STATICOPENGL = False
BF_OPENGL_INC = '${BF_OPENGL}/include'
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
Modified: branches/sculpt25/intern/ghost/SConscript
===================================================================
--- branches/sculpt25/intern/ghost/SConscript 2009-11-02 18:47:03 UTC (rev 24257)
+++ branches/sculpt25/intern/ghost/SConscript 2009-11-02 18:56:56 UTC (rev 24258)
@@ -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/sculpt25/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/sculpt25/intern/ghost/intern/GHOST_SystemWin32.cpp 2009-11-02 18:47:03 UTC (rev 24257)
+++ branches/sculpt25/intern/ghost/intern/GHOST_SystemWin32.cpp 2009-11-02 18:56:56 UTC (rev 24258)
@@ -132,8 +132,8 @@
GHOST_SystemWin32::GHOST_SystemWin32()
: m_hasPerformanceCounter(false), m_freq(0), m_start(0),
- m_seperateLeftRight(false),
- m_seperateLeftRightInitialized(false)
+ m_separateLeftRight(false),
+ m_separateLeftRightInitialized(false)
{
m_displayManager = new GHOST_DisplayManagerWin32 ();
GHOST_ASSERT(m_displayManager, "GHOST_SystemWin32::GHOST_SystemWin32(): m_displayManager==0\n");
@@ -274,7 +274,7 @@
It didn't work all that well on some newer hardware, and worked less
well with the passage of time, so it was fully disabled in ME.
*/
- if (m_seperateLeftRight && m_seperateLeftRightInitialized) {
+ if (m_separateLeftRight && m_separateLeftRightInitialized) {
bool down = HIBYTE(::GetKeyState(VK_LSHIFT)) != 0;
keys.set(GHOST_kModifierKeyLeftShift, down);
down = HIBYTE(::GetKeyState(VK_RSHIFT)) != 0;
@@ -581,29 +581,29 @@
case VK_SHIFT:
case VK_CONTROL:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list