Revision: 26542
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26542
Author: eman
Date: 2010-02-02 07:11:35 +0100 (Tue, 02 Feb 2010)
Log Message:
-----------
Merge 26183:26463
Modified Paths:
--------------
branches/nurbs25/CMakeLists.txt
branches/nurbs25/SConstruct
branches/nurbs25/config/darwin-config.py
branches/nurbs25/config/linux2-config.py
branches/nurbs25/config/win32-mingw-config.py
branches/nurbs25/config/win32-vc-config.py
branches/nurbs25/intern/ghost/GHOST_IWindow.h
branches/nurbs25/intern/ghost/GHOST_Types.h
branches/nurbs25/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/nurbs25/intern/ghost/intern/GHOST_Window.cpp
branches/nurbs25/intern/ghost/intern/GHOST_Window.h
branches/nurbs25/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/nurbs25/intern/ghost/intern/GHOST_WindowCocoa.h
branches/nurbs25/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/nurbs25/intern/ghost/intern/GHOST_WindowManager.cpp
branches/nurbs25/intern/ghost/intern/GHOST_WindowManager.h
branches/nurbs25/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/nurbs25/intern/ghost/intern/GHOST_WindowX11.cpp
branches/nurbs25/intern/smoke/make/msvc_9_0/smoke.vcproj
branches/nurbs25/projectfiles_vc9/blender/blender.vcproj
branches/nurbs25/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/nurbs25/projectfiles_vc9/blender/windowmanager/windowmanager.vcproj
branches/nurbs25/release/scripts/io/export_3ds.py
branches/nurbs25/release/scripts/io/export_fbx.py
branches/nurbs25/release/scripts/io/export_mdd.py
branches/nurbs25/release/scripts/io/export_obj.py
branches/nurbs25/release/scripts/io/export_ply.py
branches/nurbs25/release/scripts/io/export_x3d.py
branches/nurbs25/release/scripts/modules/bpy/__init__.py
branches/nurbs25/release/scripts/modules/bpy/app.py
branches/nurbs25/release/scripts/modules/bpy/ops.py
branches/nurbs25/release/scripts/modules/bpy/utils.py
branches/nurbs25/release/scripts/modules/rigify/__init__.py
branches/nurbs25/release/scripts/modules/rigify/mouth.py
branches/nurbs25/release/scripts/modules/rigify/spine_pivot_flex.py
branches/nurbs25/release/scripts/op/add_mesh_torus.py
branches/nurbs25/release/scripts/op/object.py
branches/nurbs25/release/scripts/op/uv.py
branches/nurbs25/release/scripts/op/uvcalc_follow_active.py
branches/nurbs25/release/scripts/op/wm.py
branches/nurbs25/release/scripts/ui/properties_data_modifier.py
branches/nurbs25/release/scripts/ui/properties_material.py
branches/nurbs25/release/scripts/ui/properties_object_constraint.py
branches/nurbs25/release/scripts/ui/properties_render.py
branches/nurbs25/release/scripts/ui/properties_texture.py
branches/nurbs25/release/scripts/ui/properties_world.py
branches/nurbs25/release/scripts/ui/space_info.py
branches/nurbs25/release/scripts/ui/space_sequencer.py
branches/nurbs25/release/scripts/ui/space_userpref.py
branches/nurbs25/release/scripts/ui/space_view3d.py
branches/nurbs25/source/blender/blenkernel/BKE_animsys.h
branches/nurbs25/source/blender/blenkernel/BKE_blender.h
branches/nurbs25/source/blender/blenkernel/BKE_deform.h
branches/nurbs25/source/blender/blenkernel/BKE_fcurve.h
branches/nurbs25/source/blender/blenkernel/BKE_image.h
branches/nurbs25/source/blender/blenkernel/BKE_material.h
branches/nurbs25/source/blender/blenkernel/BKE_screen.h
branches/nurbs25/source/blender/blenkernel/BKE_sequencer.h
branches/nurbs25/source/blender/blenkernel/BKE_sound.h
branches/nurbs25/source/blender/blenkernel/BKE_texture.h
branches/nurbs25/source/blender/blenkernel/intern/CCGSubSurf.c
branches/nurbs25/source/blender/blenkernel/intern/DerivedMesh.c
branches/nurbs25/source/blender/blenkernel/intern/anim_sys.c
branches/nurbs25/source/blender/blenkernel/intern/blender.c
branches/nurbs25/source/blender/blenkernel/intern/colortools.c
branches/nurbs25/source/blender/blenkernel/intern/constraint.c
branches/nurbs25/source/blender/blenkernel/intern/context.c
branches/nurbs25/source/blender/blenkernel/intern/deform.c
branches/nurbs25/source/blender/blenkernel/intern/depsgraph.c
branches/nurbs25/source/blender/blenkernel/intern/fcurve.c
branches/nurbs25/source/blender/blenkernel/intern/fluidsim.c
branches/nurbs25/source/blender/blenkernel/intern/image.c
branches/nurbs25/source/blender/blenkernel/intern/ipo.c
branches/nurbs25/source/blender/blenkernel/intern/library.c
branches/nurbs25/source/blender/blenkernel/intern/material.c
branches/nurbs25/source/blender/blenkernel/intern/modifier.c
branches/nurbs25/source/blender/blenkernel/intern/node.c
branches/nurbs25/source/blender/blenkernel/intern/object.c
branches/nurbs25/source/blender/blenkernel/intern/particle_system.c
branches/nurbs25/source/blender/blenkernel/intern/sequencer.c
branches/nurbs25/source/blender/blenkernel/intern/shrinkwrap.c
branches/nurbs25/source/blender/blenkernel/intern/simple_deform.c
branches/nurbs25/source/blender/blenkernel/intern/softbody.c
branches/nurbs25/source/blender/blenkernel/intern/sound.c
branches/nurbs25/source/blender/blenkernel/intern/subsurf_ccg.c
branches/nurbs25/source/blender/blenkernel/intern/text.c
branches/nurbs25/source/blender/blenkernel/intern/texture.c
branches/nurbs25/source/blender/blenkernel/intern/unit.c
branches/nurbs25/source/blender/blenkernel/intern/world.c
branches/nurbs25/source/blender/blenkernel/intern/writeavi.c
branches/nurbs25/source/blender/blenkernel/intern/writeffmpeg.c
branches/nurbs25/source/blender/blenlib/BLI_math_matrix.h
branches/nurbs25/source/blender/blenlib/BLI_path_util.h
branches/nurbs25/source/blender/blenlib/BLI_storage_types.h
branches/nurbs25/source/blender/blenlib/BLI_string.h
branches/nurbs25/source/blender/blenlib/BLI_threads.h
branches/nurbs25/source/blender/blenlib/BLI_winstuff.h
branches/nurbs25/source/blender/blenlib/intern/bpath.c
branches/nurbs25/source/blender/blenlib/intern/fileops.c
branches/nurbs25/source/blender/blenlib/intern/math_matrix.c
branches/nurbs25/source/blender/blenlib/intern/math_rotation.c
branches/nurbs25/source/blender/blenlib/intern/path_util.c
branches/nurbs25/source/blender/blenlib/intern/storage.c
branches/nurbs25/source/blender/blenlib/intern/string.c
branches/nurbs25/source/blender/blenlib/intern/threads.c
branches/nurbs25/source/blender/blenloader/intern/readfile.c
branches/nurbs25/source/blender/blenloader/intern/undofile.c
branches/nurbs25/source/blender/blenloader/intern/writefile.c
branches/nurbs25/source/blender/collada/DocumentExporter.cpp
branches/nurbs25/source/blender/collada/DocumentImporter.cpp
branches/nurbs25/source/blender/editors/animation/anim_draw.c
branches/nurbs25/source/blender/editors/animation/drivers.c
branches/nurbs25/source/blender/editors/animation/keyframing.c
branches/nurbs25/source/blender/editors/animation/keyingsets.c
branches/nurbs25/source/blender/editors/armature/editarmature.c
branches/nurbs25/source/blender/editors/armature/meshlaplacian.c
branches/nurbs25/source/blender/editors/armature/poselib.c
branches/nurbs25/source/blender/editors/armature/poseobject.c
branches/nurbs25/source/blender/editors/curve/editcurve.c
branches/nurbs25/source/blender/editors/curve/editfont.c
branches/nurbs25/source/blender/editors/include/ED_anim_api.h
branches/nurbs25/source/blender/editors/include/ED_armature.h
branches/nurbs25/source/blender/editors/include/ED_mesh.h
branches/nurbs25/source/blender/editors/include/ED_object.h
branches/nurbs25/source/blender/editors/include/ED_view3d.h
branches/nurbs25/source/blender/editors/include/UI_interface.h
branches/nurbs25/source/blender/editors/interface/interface.c
branches/nurbs25/source/blender/editors/interface/interface_anim.c
branches/nurbs25/source/blender/editors/interface/interface_draw.c
branches/nurbs25/source/blender/editors/interface/interface_handlers.c
branches/nurbs25/source/blender/editors/interface/interface_icons.c
branches/nurbs25/source/blender/editors/interface/interface_intern.h
branches/nurbs25/source/blender/editors/interface/interface_layout.c
branches/nurbs25/source/blender/editors/interface/interface_templates.c
branches/nurbs25/source/blender/editors/interface/interface_widgets.c
branches/nurbs25/source/blender/editors/interface/resources.c
branches/nurbs25/source/blender/editors/interface/view2d.c
branches/nurbs25/source/blender/editors/interface/view2d_ops.c
branches/nurbs25/source/blender/editors/mesh/editmesh.c
branches/nurbs25/source/blender/editors/mesh/editmesh_lib.c
branches/nurbs25/source/blender/editors/mesh/editmesh_mods.c
branches/nurbs25/source/blender/editors/mesh/editmesh_tools.c
branches/nurbs25/source/blender/editors/mesh/loopcut.c
branches/nurbs25/source/blender/editors/mesh/mesh_data.c
branches/nurbs25/source/blender/editors/mesh/mesh_intern.h
branches/nurbs25/source/blender/editors/mesh/mesh_ops.c
branches/nurbs25/source/blender/editors/object/object_add.c
branches/nurbs25/source/blender/editors/object/object_constraint.c
branches/nurbs25/source/blender/editors/object/object_edit.c
branches/nurbs25/source/blender/editors/object/object_group.c
branches/nurbs25/source/blender/editors/object/object_intern.h
branches/nurbs25/source/blender/editors/object/object_modifier.c
branches/nurbs25/source/blender/editors/object/object_ops.c
branches/nurbs25/source/blender/editors/object/object_relations.c
branches/nurbs25/source/blender/editors/object/object_vgroup.c
branches/nurbs25/source/blender/editors/physics/particle_edit.c
branches/nurbs25/source/blender/editors/render/render_intern.h
branches/nurbs25/source/blender/editors/render/render_ops.c
branches/nurbs25/source/blender/editors/render/render_preview.c
branches/nurbs25/source/blender/editors/render/render_shading.c
branches/nurbs25/source/blender/editors/screen/area.c
branches/nurbs25/source/blender/editors/screen/screen_edit.c
branches/nurbs25/source/blender/editors/screen/screen_ops.c
branches/nurbs25/source/blender/editors/screen/screendump.c
branches/nurbs25/source/blender/editors/sculpt_paint/paint_intern.h
branches/nurbs25/source/blender/editors/sculpt_paint/paint_ops.c
branches/nurbs25/source/blender/editors/sculpt_paint/paint_vertex.c
branches/nurbs25/source/blender/editors/sculpt_paint/sculpt.c
branches/nurbs25/source/blender/editors/sound/sound_ops.c
branches/nurbs25/source/blender/editors/space_action/action_edit.c
branches/nurbs25/source/blender/editors/space_action/space_action.c
branches/nurbs25/source/blender/editors/space_api/spacetypes.c
branches/nurbs25/source/blender/editors/space_buttons/buttons_context.c
branches/nurbs25/source/blender/editors/space_buttons/buttons_ops.c
branches/nurbs25/source/blender/editors/space_buttons/space_buttons.c
branches/nurbs25/source/blender/editors/space_console/space_console.c
branches/nurbs25/source/blender/editors/space_file/file_draw.c
branches/nurbs25/source/blender/editors/space_file/file_ops.c
branches/nurbs25/source/blender/editors/space_file/filelist.c
branches/nurbs25/source/blender/editors/space_file/filelist.h
branches/nurbs25/source/blender/editors/space_file/space_file.c
branches/nurbs25/source/blender/editors/space_file/writeimage.c
branches/nurbs25/source/blender/editors/space_graph/graph_draw.c
branches/nurbs25/source/blender/editors/space_graph/graph_edit.c
branches/nurbs25/source/blender/editors/space_graph/graph_select.c
branches/nurbs25/source/blender/editors/space_graph/graph_utils.c
branches/nurbs25/source/blender/editors/space_graph/space_graph.c
branches/nurbs25/source/blender/editors/space_image/image_draw.c
branches/nurbs25/source/blender/editors/space_image/image_ops.c
branches/nurbs25/source/blender/editors/space_image/space_image.c
branches/nurbs25/source/blender/editors/space_info/info_ops.c
branches/nurbs25/source/blender/editors/space_info/space_info.c
branches/nurbs25/source/blender/editors/space_logic/logic_window.c
branches/nurbs25/source/blender/editors/space_logic/space_logic.c
branches/nurbs25/source/blender/editors/space_nla/space_nla.c
branches/nurbs25/source/blender/editors/space_node/drawnode.c
branches/nurbs25/source/blender/editors/space_node/node_draw.c
branches/nurbs25/source/blender/editors/space_node/node_edit.c
branches/nurbs25/source/blender/editors/space_node/node_select.c
branches/nurbs25/source/blender/editors/space_node/space_node.c
branches/nurbs25/source/blender/editors/space_outliner/outliner.c
branches/nurbs25/source/blender/editors/space_outliner/space_outliner.c
branches/nurbs25/source/blender/editors/space_script/space_script.c
branches/nurbs25/source/blender/editors/space_sequencer/sequencer_add.c
branches/nurbs25/source/blender/editors/space_sequencer/space_sequencer.c
branches/nurbs25/source/blender/editors/space_sound/space_sound.c
branches/nurbs25/source/blender/editors/space_text/space_text.c
branches/nurbs25/source/blender/editors/space_text/text_draw.c
branches/nurbs25/source/blender/editors/space_text/text_intern.h
branches/nurbs25/source/blender/editors/space_text/text_ops.c
branches/nurbs25/source/blender/editors/space_text/text_python.c
branches/nurbs25/source/blender/editors/space_time/space_time.c
branches/nurbs25/source/blender/editors/space_userpref/space_userpref.c
branches/nurbs25/source/blender/editors/space_view3d/drawanimviz.c
branches/nurbs25/source/blender/editors/space_view3d/drawarmature.c
branches/nurbs25/source/blender/editors/space_view3d/drawobject.c
branches/nurbs25/source/blender/editors/space_view3d/space_view3d.c
branches/nurbs25/source/blender/editors/space_view3d/view3d_buttons.c
branches/nurbs25/source/blender/editors/space_view3d/view3d_edit.c
branches/nurbs25/source/blender/editors/space_view3d/view3d_header.c
branches/nurbs25/source/blender/editors/space_view3d/view3d_select.c
branches/nurbs25/source/blender/editors/space_view3d/view3d_view.c
branches/nurbs25/source/blender/editors/transform/transform.c
branches/nurbs25/source/blender/editors/transform/transform_conversions.c
branches/nurbs25/source/blender/editors/transform/transform_generics.c
branches/nurbs25/source/blender/editors/transform/transform_numinput.c
branches/nurbs25/source/blender/editors/util/editmode_undo.c
branches/nurbs25/source/blender/gpu/intern/gpu_extensions.c
branches/nurbs25/source/blender/imbuf/intern/anim.c
branches/nurbs25/source/blender/imbuf/intern/anim5.c
branches/nurbs25/source/blender/imbuf/intern/dds/dds_api.cpp
branches/nurbs25/source/blender/imbuf/intern/dynlibtiff.c
branches/nurbs25/source/blender/imbuf/intern/gen_dynlibtiff.py
branches/nurbs25/source/blender/makesdna/DNA_anim_types.h
branches/nurbs25/source/blender/makesdna/DNA_color_types.h
branches/nurbs25/source/blender/makesdna/DNA_modifier_types.h
branches/nurbs25/source/blender/makesdna/DNA_scene_types.h
branches/nurbs25/source/blender/makesdna/DNA_screen_types.h
branches/nurbs25/source/blender/makesdna/DNA_space_types.h
branches/nurbs25/source/blender/makesdna/DNA_userdef_types.h
branches/nurbs25/source/blender/makesdna/DNA_windowmanager_types.h
branches/nurbs25/source/blender/makesdna/DNA_world_types.h
branches/nurbs25/source/blender/makesdna/intern/makesdna.c
branches/nurbs25/source/blender/makesrna/RNA_access.h
branches/nurbs25/source/blender/makesrna/RNA_enum_types.h
branches/nurbs25/source/blender/makesrna/RNA_types.h
branches/nurbs25/source/blender/makesrna/intern/rna_access.c
branches/nurbs25/source/blender/makesrna/intern/rna_brush.c
branches/nurbs25/source/blender/makesrna/intern/rna_camera.c
branches/nurbs25/source/blender/makesrna/intern/rna_constraint.c
branches/nurbs25/source/blender/makesrna/intern/rna_curve.c
branches/nurbs25/source/blender/makesrna/intern/rna_fcurve.c
branches/nurbs25/source/blender/makesrna/intern/rna_gpencil.c
branches/nurbs25/source/blender/makesrna/intern/rna_image_api.c
branches/nurbs25/source/blender/makesrna/intern/rna_material.c
branches/nurbs25/source/blender/makesrna/intern/rna_modifier.c
branches/nurbs25/source/blender/makesrna/intern/rna_nodetree.c
branches/nurbs25/source/blender/makesrna/intern/rna_object.c
branches/nurbs25/source/blender/makesrna/intern/rna_object_api.c
branches/nurbs25/source/blender/makesrna/intern/rna_particle.c
branches/nurbs25/source/blender/makesrna/intern/rna_render.c
branches/nurbs25/source/blender/makesrna/intern/rna_scene.c
branches/nurbs25/source/blender/makesrna/intern/rna_space.c
branches/nurbs25/source/blender/makesrna/intern/rna_ui_api.c
branches/nurbs25/source/blender/makesrna/intern/rna_userdef.c
branches/nurbs25/source/blender/makesrna/intern/rna_wm.c
branches/nurbs25/source/blender/makesrna/intern/rna_wm_api.c
branches/nurbs25/source/blender/makesrna/intern/rna_world.c
branches/nurbs25/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
branches/nurbs25/source/blender/python/generic/Mathutils.c
branches/nurbs25/source/blender/python/generic/Mathutils.h
branches/nurbs25/source/blender/python/generic/euler.c
branches/nurbs25/source/blender/python/generic/matrix.c
branches/nurbs25/source/blender/python/generic/quat.c
branches/nurbs25/source/blender/python/generic/vector.c
branches/nurbs25/source/blender/python/intern/bpy_interface.c
branches/nurbs25/source/blender/python/intern/bpy_operator.c
branches/nurbs25/source/blender/python/intern/bpy_rna.c
branches/nurbs25/source/blender/python/sphinx_doc_gen.py
branches/nurbs25/source/blender/quicktime/apple/qtkit_export.m
branches/nurbs25/source/blender/quicktime/apple/qtkit_import.m
branches/nurbs25/source/blender/quicktime/apple/quicktime_import.c
branches/nurbs25/source/blender/render/CMakeLists.txt
branches/nurbs25/source/blender/render/extern/include/RE_shader_ext.h
branches/nurbs25/source/blender/render/intern/include/render_types.h
branches/nurbs25/source/blender/render/intern/include/rendercore.h
branches/nurbs25/source/blender/render/intern/source/convertblender.c
branches/nurbs25/source/blender/render/intern/source/occlusion.c
branches/nurbs25/source/blender/render/intern/source/pipeline.c
branches/nurbs25/source/blender/render/intern/source/rayshade.c
branches/nurbs25/source/blender/render/intern/source/rendercore.c
branches/nurbs25/source/blender/render/intern/source/shadeinput.c
branches/nurbs25/source/blender/render/intern/source/shadeoutput.c
branches/nurbs25/source/blender/render/intern/source/strand.c
branches/nurbs25/source/blender/render/intern/source/texture.c
branches/nurbs25/source/blender/render/intern/source/zbuf.c
branches/nurbs25/source/blender/windowmanager/WM_api.h
branches/nurbs25/source/blender/windowmanager/WM_types.h
branches/nurbs25/source/blender/windowmanager/intern/wm.c
branches/nurbs25/source/blender/windowmanager/intern/wm_cursors.c
branches/nurbs25/source/blender/windowmanager/intern/wm_draw.c
branches/nurbs25/source/blender/windowmanager/intern/wm_event_system.c
branches/nurbs25/source/blender/windowmanager/intern/wm_gesture.c
branches/nurbs25/source/blender/windowmanager/intern/wm_init_exit.c
branches/nurbs25/source/blender/windowmanager/intern/wm_keymap.c
branches/nurbs25/source/blender/windowmanager/intern/wm_operators.c
branches/nurbs25/source/blender/windowmanager/intern/wm_window.c
branches/nurbs25/source/blender/windowmanager/wm_cursors.h
branches/nurbs25/source/blender/windowmanager/wm_event_system.h
branches/nurbs25/source/blender/windowmanager/wm_event_types.h
branches/nurbs25/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/nurbs25/source/creator/CMakeLists.txt
branches/nurbs25/source/creator/creator.c
branches/nurbs25/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/nurbs25/source/gameengine/GameLogic/SCA_ISensor.h
branches/nurbs25/source/gameengine/Ketsji/KX_GameObject.cpp
branches/nurbs25/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/nurbs25/source/gameengine/Ketsji/KX_Scene.cpp
branches/nurbs25/source/gameengine/Ketsji/KX_Scene.h
branches/nurbs25/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/nurbs25/source/gameengine/PyDoc/GameLogic.py
branches/nurbs25/source/gameengine/PyDoc/GameTypes.py
branches/nurbs25/source/nan_compile.mk
branches/nurbs25/source/nan_definitions.mk
Added Paths:
-----------
branches/nurbs25/release/scripts/cfg/
branches/nurbs25/source/blender/windowmanager/intern/wm_dragdrop.c
Removed Paths:
-------------
branches/nurbs25/source/blender/editors/include/ED_interface.h
Modified: branches/nurbs25/CMakeLists.txt
===================================================================
--- branches/nurbs25/CMakeLists.txt 2010-02-02 00:02:55 UTC (rev 26541)
+++ branches/nurbs25/CMakeLists.txt 2010-02-02 06:11:35 UTC (rev 26542)
@@ -88,6 +88,8 @@
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the
compiler)" OFF)
ENDIF()
+OPTION(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the
raytracer" OFF)
+
IF (APPLE)
OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated
Carbon" ON)
OPTION(USE_QTKIT "Use QtKit instead of Carbon quicktime
(needed for having partial quicktime for 64bit)" OFF)
@@ -217,7 +219,7 @@
IF (WITH_OPENCOLLADA)
SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH
"OpenCollada Directory")
SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
- SET(OPENCOLLADA_LIB OpenCOLLADAStreamWriter
OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils
GeneratedSaxParser UTF MathMLSolver pcre ftoa Buffer)
+ SET(OPENCOLLADA_LIB OpenCOLLADAStreamWriter
OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils
GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer)
SET(OPENCOLLADA_INC ${OPENCOLLADA})
SET(PCRE /usr CACHE FILEPATH "PCRE Directory")
SET(PCRE_LIBPATH ${PCRE}/lib)
@@ -561,7 +563,7 @@
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" )
+ SET(OPENCOLLADA_LIB "OpenCOLLADASaxFrameworkLoader
-lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter
-lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa" )
#pcre is bundled with openCollada
#SET(PCRE ${LIBDIR}/pcre)
#SET(PCRE_LIBPATH ${PCRE}/lib)
Modified: branches/nurbs25/SConstruct
===================================================================
--- branches/nurbs25/SConstruct 2010-02-02 00:02:55 UTC (rev 26541)
+++ branches/nurbs25/SConstruct 2010-02-02 06:11:35 UTC (rev 26542)
@@ -578,11 +578,14 @@
allinstall = [blenderinstall, dotblenderinstall, scriptinstall,
plugininstall, textinstall]
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'):
- if env['OURPLATFORM'] == 'win64-vc':
- dllsources = []
- else:
- dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll',
- '${BF_PNG_LIBPATH}/libpng.dll',
+ dllsources = []
+
+ if env['OURPLATFORM'] != 'win64-vc':
+ if env['OURPLATFORM'] != 'win32-mingw':
+ # For MinGW static linking will be used
+ dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']
+
+ dllsources += ['${BF_PNG_LIBPATH}/libpng.dll',
'${BF_ZLIB_LIBPATH}/zlib.dll',
'${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
dllsources += ['${BF_PTHREADS_LIBPATH}/${BF_PTHREADS_LIB}.dll']
@@ -599,7 +602,8 @@
if env['WITH_BF_ICONV']:
if env['OURPLATFORM'] == 'win64-vc':
pass # we link statically to iconv on win64
- else:
+ elif env['OURPLATFORM'] != 'win32-mingw':
+ #gettext for MinGW is compiled staticly
dllsources += ['${BF_ICONV_LIBPATH}/iconv.dll']
if env['WITH_BF_OPENAL']:
dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
Modified: branches/nurbs25/config/darwin-config.py
===================================================================
--- branches/nurbs25/config/darwin-config.py 2010-02-02 00:02:55 UTC (rev
26541)
+++ branches/nurbs25/config/darwin-config.py 2010-02-02 06:11:35 UTC (rev
26542)
@@ -73,6 +73,12 @@
################### Dependency settings ##################
#############################################################################
+#Defaults openMP to true if compiler (currently only gcc 4.2) handles it
+if CC == 'gcc-4.2':
+ WITH_BF_OPENMP = True # multithreading for fluids, cloth and smoke
+else:
+ WITH_BF_OPENMP = False
+
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
FFMPEG_PRECOMPILED = True
@@ -120,8 +126,6 @@
BF_PYTHON_LINKFLAGS = ['-u', '__dummy']+BF_PYTHON_LINKFLAGS
-WITH_BF_OPENMP = '0' # multithreading for fluids, cloth and smoke ( only
works with ICC atm )
-
WITH_BF_OPENAL = True
#different lib must be used following version of gcc
# for gcc 3.3
@@ -264,17 +268,20 @@
BF_COLLADA_LIB = 'bf_collada'
BF_OPENCOLLADA = LIBDIR + '/opencollada'
BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework
OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser
UTF xml2'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework
OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser
UTF xml2 buffer ftoa'
BF_OPENCOLLADA_LIBPATH = LIBDIR + '/opencollada'
BF_PCRE = LIBDIR + '/opencollada'
BF_PCRE_LIB = 'pcre'
-BF_PCRE_LIBPATH = '${BF_PCRE}/lib'
+#BF_PCRE_LIBPATH = '${BF_PCRE}/lib' #use OSX dynlib version of pcre
#BF_EXPAT = '/usr'
#BF_EXPAT_LIB = 'expat'
#BF_EXPAT_LIBPATH = '/usr/lib'
#Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = False
+if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
+ WITH_BF_RAYOPTIMIZATION = True
+else:
+ WITH_BF_RAYOPTIMIZATION = False
if MACOSX_ARCHITECTURE == 'i386':
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
elif MACOSX_ARCHITECTURE == 'x86_64':
@@ -340,15 +347,9 @@
REL_CFLAGS = REL_CFLAGS+['-mssse3']
REL_CCFLAGS = REL_CCFLAGS+['-mssse3']
-##BF_DEPEND = True
-##
-##AR = ar
-##ARFLAGS = ruv
-##ARFLAGSQUIET = ru
-##
-#C_WARN = ['-Wdeclaration-after-statement']
-
CC_WARN = ['-Wall']
+C_WARN = ['-Wno-char-subscripts', '-Wpointer-arith', '-Wcast-align',
'-Wdeclaration-after-statement', '-Wno-unknown-pragmas']
+CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
##FIX_STUBS_WARNINGS = -Wno-unused
Modified: branches/nurbs25/config/linux2-config.py
===================================================================
--- branches/nurbs25/config/linux2-config.py 2010-02-02 00:02:55 UTC (rev
26541)
+++ branches/nurbs25/config/linux2-config.py 2010-02-02 06:11:35 UTC (rev
26542)
@@ -156,7 +156,7 @@
BF_COLLADA_INC = '${BF_COLLADA}'
BF_COLLADA_LIB = 'bf_collada'
BF_OPENCOLLADA = '/usr'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver
pcre Buffer ftoa'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver
pcre buffer ftoa'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
BF_PCRE = ''
BF_PCRE_LIB = 'pcre'
Modified: branches/nurbs25/config/win32-mingw-config.py
===================================================================
--- branches/nurbs25/config/win32-mingw-config.py 2010-02-02 00:02:55 UTC
(rev 26541)
+++ branches/nurbs25/config/win32-mingw-config.py 2010-02-02 06:11:35 UTC
(rev 26542)
@@ -85,11 +85,17 @@
WITH_BF_INTERNATIONAL = True
-BF_GETTEXT = LIBDIR + '/gettext'
+BF_GETTEXT = LIBDIR + '/gcc/gettext'
BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'gnu_gettext'
+BF_GETTEXT_LIB = 'intl'
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+WITH_BF_FFTW3 = False
+BF_FFTW3 = LIBDIR + '/gcc/fftw3'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'fftw3'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
WITH_BF_GAMEENGINE = False
WITH_BF_PLAYER = False
Modified: branches/nurbs25/config/win32-vc-config.py
===================================================================
--- branches/nurbs25/config/win32-vc-config.py 2010-02-02 00:02:55 UTC (rev
26541)
+++ branches/nurbs25/config/win32-vc-config.py 2010-02-02 06:11:35 UTC (rev
26542)
@@ -145,7 +145,7 @@
BF_OPENCOLLADA = LIBDIR + '/opencollada'
BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver
xml2 pcre'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver
xml2 pcre buffer ftoa'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
#Ray trace optimization
Modified: branches/nurbs25/intern/ghost/GHOST_IWindow.h
===================================================================
--- branches/nurbs25/intern/ghost/GHOST_IWindow.h 2010-02-02 00:02:55 UTC
(rev 26541)
+++ branches/nurbs25/intern/ghost/GHOST_IWindow.h 2010-02-02 06:11:35 UTC
(rev 26542)
@@ -73,6 +73,12 @@
virtual bool getValid() const = 0;
/**
+ * Returns the associated OS object/handle
+ * @return The associated OS object/handle
+ */
+ virtual void* getOSWindow() const = 0;
+
+ /**
* Returns the type of drawing context used in this window.
* @return The current type of drawing context.
*/
Modified: branches/nurbs25/intern/ghost/GHOST_Types.h
===================================================================
--- branches/nurbs25/intern/ghost/GHOST_Types.h 2010-02-02 00:02:55 UTC (rev
26541)
+++ branches/nurbs25/intern/ghost/GHOST_Types.h 2010-02-02 06:11:35 UTC (rev
26542)
@@ -204,6 +204,7 @@
GHOST_kStandardCursorTopRightCorner,
GHOST_kStandardCursorBottomRightCorner,
GHOST_kStandardCursorBottomLeftCorner,
+ GHOST_kStandardCursorCopy,
GHOST_kStandardCursorCustom,
GHOST_kStandardCursorNumCursors,
GHOST_kStandardCursorPencil
Modified: branches/nurbs25/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/nurbs25/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-02-02
00:02:55 UTC (rev 26541)
+++ branches/nurbs25/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-02-02
06:11:35 UTC (rev 26542)
@@ -1002,6 +1002,9 @@
case GHOST_kEventWindowUpdate:
pushEvent( new GHOST_Event(getMilliSeconds(),
GHOST_kEventWindowUpdate, window) );
break;
+ case GHOST_kEventWindowMove:
+ pushEvent( new GHOST_Event(getMilliSeconds(),
GHOST_kEventWindowMove, window) );
+ break;
case GHOST_kEventWindowSize:
if (!m_ignoreWindowSizedMessages)
{
@@ -1183,7 +1186,15 @@
NSEvent *event = (NSEvent *)eventPtr;
GHOST_IWindow* window = m_windowManager->getActiveWindow();
- if (!window) return GHOST_kFailure;
+ if (!window) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
