[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39872] branches/cycles: Cycles: svn merge -r39669:39870 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Brecht Van Lommel
brechtvanlommel at pandora.be
Fri Sep 2 14:33:29 CEST 2011
Revision: 39872
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39872
Author: blendix
Date: 2011-09-02 12:33:29 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
Cycles: svn merge -r39669:39870 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39669
Modified Paths:
--------------
branches/cycles/CMakeLists.txt
branches/cycles/SConstruct
branches/cycles/build_files/cmake/config/blender_lite.cmake
branches/cycles/build_files/cmake/packaging.cmake
branches/cycles/build_files/package_spec/rpm/blender.spec.in
branches/cycles/build_files/scons/config/darwin-config.py
branches/cycles/build_files/scons/config/win32-vc-config.py
branches/cycles/build_files/scons/tools/Blender.py
branches/cycles/build_files/scons/tools/btools.py
branches/cycles/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
branches/cycles/doc/python_api/rst/bge.render.rst
branches/cycles/doc/python_api/rst/bge.types.rst
branches/cycles/doc/python_api/sphinx_doc_gen.py
branches/cycles/doc/python_api/sphinx_doc_gen.sh
branches/cycles/intern/audaspace/CMakeLists.txt
branches/cycles/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_AccumulatorFactory.h
branches/cycles/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
branches/cycles/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
branches/cycles/intern/audaspace/FX/AUD_ButterworthFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_ButterworthFactory.h
branches/cycles/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
branches/cycles/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
branches/cycles/intern/audaspace/FX/AUD_DelayFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_DelayFactory.h
branches/cycles/intern/audaspace/FX/AUD_DelayReader.cpp
branches/cycles/intern/audaspace/FX/AUD_DelayReader.h
branches/cycles/intern/audaspace/FX/AUD_DoubleFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_DoubleFactory.h
branches/cycles/intern/audaspace/FX/AUD_DoubleReader.cpp
branches/cycles/intern/audaspace/FX/AUD_DoubleReader.h
branches/cycles/intern/audaspace/FX/AUD_EffectFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_EffectFactory.h
branches/cycles/intern/audaspace/FX/AUD_EffectReader.cpp
branches/cycles/intern/audaspace/FX/AUD_EffectReader.h
branches/cycles/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_EnvelopeFactory.h
branches/cycles/intern/audaspace/FX/AUD_FaderFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_FaderFactory.h
branches/cycles/intern/audaspace/FX/AUD_FaderReader.cpp
branches/cycles/intern/audaspace/FX/AUD_FaderReader.h
branches/cycles/intern/audaspace/FX/AUD_HighpassFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_HighpassFactory.h
branches/cycles/intern/audaspace/FX/AUD_IIRFilterFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_IIRFilterFactory.h
branches/cycles/intern/audaspace/FX/AUD_IIRFilterReader.cpp
branches/cycles/intern/audaspace/FX/AUD_IIRFilterReader.h
branches/cycles/intern/audaspace/FX/AUD_LimiterFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_LimiterFactory.h
branches/cycles/intern/audaspace/FX/AUD_LimiterReader.cpp
branches/cycles/intern/audaspace/FX/AUD_LimiterReader.h
branches/cycles/intern/audaspace/FX/AUD_LoopFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_LoopFactory.h
branches/cycles/intern/audaspace/FX/AUD_LoopReader.cpp
branches/cycles/intern/audaspace/FX/AUD_LoopReader.h
branches/cycles/intern/audaspace/FX/AUD_LowpassFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_LowpassFactory.h
branches/cycles/intern/audaspace/FX/AUD_PingPongFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_PingPongFactory.h
branches/cycles/intern/audaspace/FX/AUD_PitchFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_PitchFactory.h
branches/cycles/intern/audaspace/FX/AUD_PitchReader.cpp
branches/cycles/intern/audaspace/FX/AUD_PitchReader.h
branches/cycles/intern/audaspace/FX/AUD_RectifyFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_RectifyFactory.h
branches/cycles/intern/audaspace/FX/AUD_ReverseFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_ReverseFactory.h
branches/cycles/intern/audaspace/FX/AUD_ReverseReader.cpp
branches/cycles/intern/audaspace/FX/AUD_ReverseReader.h
branches/cycles/intern/audaspace/FX/AUD_SquareFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_SquareFactory.h
branches/cycles/intern/audaspace/FX/AUD_SumFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_SumFactory.h
branches/cycles/intern/audaspace/FX/AUD_SuperposeFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_SuperposeFactory.h
branches/cycles/intern/audaspace/FX/AUD_SuperposeReader.cpp
branches/cycles/intern/audaspace/FX/AUD_SuperposeReader.h
branches/cycles/intern/audaspace/FX/AUD_VolumeFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_VolumeFactory.h
branches/cycles/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/cycles/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/cycles/intern/audaspace/Python/AUD_PyAPI.cpp
branches/cycles/intern/audaspace/Python/AUD_PyAPI.h
branches/cycles/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
branches/cycles/intern/audaspace/SRC/AUD_SRCResampleFactory.h
branches/cycles/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
branches/cycles/intern/audaspace/SRC/AUD_SRCResampleReader.h
branches/cycles/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
branches/cycles/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
branches/cycles/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/cycles/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
branches/cycles/intern/audaspace/fftw/AUD_BandPassReader.cpp
branches/cycles/intern/audaspace/intern/AUD_3DMath.h
branches/cycles/intern/audaspace/intern/AUD_Buffer.cpp
branches/cycles/intern/audaspace/intern/AUD_Buffer.h
branches/cycles/intern/audaspace/intern/AUD_BufferReader.cpp
branches/cycles/intern/audaspace/intern/AUD_BufferReader.h
branches/cycles/intern/audaspace/intern/AUD_C-API.cpp
branches/cycles/intern/audaspace/intern/AUD_C-API.h
branches/cycles/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
branches/cycles/intern/audaspace/intern/AUD_ChannelMapperFactory.h
branches/cycles/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
branches/cycles/intern/audaspace/intern/AUD_ChannelMapperReader.h
branches/cycles/intern/audaspace/intern/AUD_ConverterFactory.cpp
branches/cycles/intern/audaspace/intern/AUD_ConverterFactory.h
branches/cycles/intern/audaspace/intern/AUD_ConverterFunctions.cpp
branches/cycles/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/cycles/intern/audaspace/intern/AUD_ConverterReader.h
branches/cycles/intern/audaspace/intern/AUD_FileFactory.cpp
branches/cycles/intern/audaspace/intern/AUD_FileFactory.h
branches/cycles/intern/audaspace/intern/AUD_I3DDevice.h
branches/cycles/intern/audaspace/intern/AUD_IDevice.h
branches/cycles/intern/audaspace/intern/AUD_IFactory.h
branches/cycles/intern/audaspace/intern/AUD_IReader.h
branches/cycles/intern/audaspace/intern/AUD_LinearResampleFactory.cpp
branches/cycles/intern/audaspace/intern/AUD_LinearResampleFactory.h
branches/cycles/intern/audaspace/intern/AUD_LinearResampleReader.cpp
branches/cycles/intern/audaspace/intern/AUD_LinearResampleReader.h
branches/cycles/intern/audaspace/intern/AUD_Mixer.cpp
branches/cycles/intern/audaspace/intern/AUD_Mixer.h
branches/cycles/intern/audaspace/intern/AUD_MixerFactory.cpp
branches/cycles/intern/audaspace/intern/AUD_MixerFactory.h
branches/cycles/intern/audaspace/intern/AUD_NULLDevice.cpp
branches/cycles/intern/audaspace/intern/AUD_NULLDevice.h
branches/cycles/intern/audaspace/intern/AUD_ReadDevice.cpp
branches/cycles/intern/audaspace/intern/AUD_ReadDevice.h
branches/cycles/intern/audaspace/intern/AUD_Reference.h
branches/cycles/intern/audaspace/intern/AUD_SequencerFactory.cpp
branches/cycles/intern/audaspace/intern/AUD_SequencerFactory.h
branches/cycles/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/cycles/intern/audaspace/intern/AUD_SequencerReader.h
branches/cycles/intern/audaspace/intern/AUD_SilenceFactory.cpp
branches/cycles/intern/audaspace/intern/AUD_SilenceFactory.h
branches/cycles/intern/audaspace/intern/AUD_SilenceReader.cpp
branches/cycles/intern/audaspace/intern/AUD_SilenceReader.h
branches/cycles/intern/audaspace/intern/AUD_SinusFactory.cpp
branches/cycles/intern/audaspace/intern/AUD_SinusFactory.h
branches/cycles/intern/audaspace/intern/AUD_SinusReader.cpp
branches/cycles/intern/audaspace/intern/AUD_SinusReader.h
branches/cycles/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/cycles/intern/audaspace/intern/AUD_SoftwareDevice.h
branches/cycles/intern/audaspace/intern/AUD_Space.h
branches/cycles/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
branches/cycles/intern/audaspace/intern/AUD_StreamBufferFactory.h
branches/cycles/intern/audaspace/jack/AUD_JackDevice.cpp
branches/cycles/intern/audaspace/jack/AUD_JackDevice.h
branches/cycles/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
branches/cycles/intern/audaspace/sndfile/AUD_SndFileFactory.h
branches/cycles/intern/audaspace/sndfile/AUD_SndFileReader.cpp
branches/cycles/intern/audaspace/sndfile/AUD_SndFileReader.h
branches/cycles/intern/ffmpeg/ffmpeg_compat.h
branches/cycles/intern/ghost/intern/GHOST_ISystemPaths.cpp
branches/cycles/intern/ghost/intern/GHOST_Path-api.cpp
branches/cycles/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/cycles/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/cycles/intern/guardedalloc/intern/mallocn.c
branches/cycles/intern/itasc/kdl/frames_io.cpp
branches/cycles/release/datafiles/blenderbuttons
branches/cycles/release/scripts/modules/bpy_extras/image_utils.py
branches/cycles/release/scripts/modules/bpy_extras/io_utils.py
branches/cycles/release/scripts/modules/bpy_extras/mesh_utils.py
branches/cycles/release/scripts/modules/bpy_extras/object_utils.py
branches/cycles/release/scripts/modules/bpy_extras/view3d_utils.py
branches/cycles/release/scripts/modules/bpy_types.py
branches/cycles/release/scripts/modules/console_python.py
branches/cycles/release/scripts/presets/ffmpeg/DV.py
branches/cycles/release/scripts/presets/ffmpeg/DVD.py
branches/cycles/release/scripts/presets/ffmpeg/SVCD.py
branches/cycles/release/scripts/presets/ffmpeg/VCD.py
branches/cycles/release/scripts/startup/bl_operators/nla.py
branches/cycles/release/scripts/startup/bl_operators/object.py
branches/cycles/release/scripts/startup/bl_ui/__init__.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_armature.py
branches/cycles/release/scripts/startup/bl_ui/properties_game.py
branches/cycles/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/cycles/release/scripts/startup/bl_ui/properties_render.py
branches/cycles/release/scripts/startup/bl_ui/properties_scene.py
branches/cycles/release/scripts/startup/bl_ui/properties_texture.py
branches/cycles/release/scripts/startup/bl_ui/space_dopesheet.py
branches/cycles/release/scripts/startup/bl_ui/space_graph.py
branches/cycles/release/scripts/startup/bl_ui/space_info.py
branches/cycles/release/scripts/startup/bl_ui/space_nla.py
branches/cycles/release/scripts/startup/bl_ui/space_sequencer.py
branches/cycles/release/scripts/startup/bl_ui/space_text.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d.py
branches/cycles/release/scripts/startup/keyingsets_builtins.py
branches/cycles/source/blender/CMakeLists.txt
branches/cycles/source/blender/avi/intern/avi.c
branches/cycles/source/blender/blenfont/intern/blf.c
branches/cycles/source/blender/blenfont/intern/blf_font.c
branches/cycles/source/blender/blenkernel/BKE_DerivedMesh.h
branches/cycles/source/blender/blenkernel/BKE_action.h
branches/cycles/source/blender/blenkernel/BKE_anim.h
branches/cycles/source/blender/blenkernel/BKE_animsys.h
branches/cycles/source/blender/blenkernel/BKE_armature.h
branches/cycles/source/blender/blenkernel/BKE_blender.h
branches/cycles/source/blender/blenkernel/BKE_constraint.h
branches/cycles/source/blender/blenkernel/BKE_fcurve.h
branches/cycles/source/blender/blenkernel/BKE_image.h
branches/cycles/source/blender/blenkernel/BKE_library.h
branches/cycles/source/blender/blenkernel/BKE_main.h
branches/cycles/source/blender/blenkernel/BKE_nla.h
branches/cycles/source/blender/blenkernel/BKE_sequencer.h
branches/cycles/source/blender/blenkernel/BKE_sound.h
branches/cycles/source/blender/blenkernel/CMakeLists.txt
branches/cycles/source/blender/blenkernel/intern/DerivedMesh.c
branches/cycles/source/blender/blenkernel/intern/action.c
branches/cycles/source/blender/blenkernel/intern/anim.c
branches/cycles/source/blender/blenkernel/intern/anim_sys.c
branches/cycles/source/blender/blenkernel/intern/armature.c
branches/cycles/source/blender/blenkernel/intern/blender.c
branches/cycles/source/blender/blenkernel/intern/cdderivedmesh.c
branches/cycles/source/blender/blenkernel/intern/collision.c
branches/cycles/source/blender/blenkernel/intern/constraint.c
branches/cycles/source/blender/blenkernel/intern/curve.c
branches/cycles/source/blender/blenkernel/intern/depsgraph.c
branches/cycles/source/blender/blenkernel/intern/fcurve.c
branches/cycles/source/blender/blenkernel/intern/fmodifier.c
branches/cycles/source/blender/blenkernel/intern/gpencil.c
branches/cycles/source/blender/blenkernel/intern/idcode.c
branches/cycles/source/blender/blenkernel/intern/image.c
branches/cycles/source/blender/blenkernel/intern/ipo.c
branches/cycles/source/blender/blenkernel/intern/key.c
branches/cycles/source/blender/blenkernel/intern/library.c
branches/cycles/source/blender/blenkernel/intern/material.c
branches/cycles/source/blender/blenkernel/intern/mesh_validate.c
branches/cycles/source/blender/blenkernel/intern/nla.c
branches/cycles/source/blender/blenkernel/intern/object.c
branches/cycles/source/blender/blenkernel/intern/particle.c
branches/cycles/source/blender/blenkernel/intern/particle_system.c
branches/cycles/source/blender/blenkernel/intern/pointcache.c
branches/cycles/source/blender/blenkernel/intern/report.c
branches/cycles/source/blender/blenkernel/intern/scene.c
branches/cycles/source/blender/blenkernel/intern/seqeffects.c
branches/cycles/source/blender/blenkernel/intern/sequencer.c
branches/cycles/source/blender/blenkernel/intern/sound.c
branches/cycles/source/blender/blenkernel/intern/subsurf_ccg.c
branches/cycles/source/blender/blenkernel/intern/unit.c
branches/cycles/source/blender/blenkernel/intern/writeffmpeg.c
branches/cycles/source/blender/blenlib/BLI_callbacks.h
branches/cycles/source/blender/blenlib/BLI_math_rotation.h
branches/cycles/source/blender/blenlib/BLI_math_vector.h
branches/cycles/source/blender/blenlib/BLI_utildefines.h
branches/cycles/source/blender/blenlib/intern/BLI_ghash.c
branches/cycles/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/cycles/source/blender/blenlib/intern/BLI_kdtree.c
branches/cycles/source/blender/blenlib/intern/callbacks.c
branches/cycles/source/blender/blenlib/intern/graph.c
branches/cycles/source/blender/blenlib/intern/math_geom.c
branches/cycles/source/blender/blenlib/intern/math_matrix.c
branches/cycles/source/blender/blenlib/intern/math_rotation.c
branches/cycles/source/blender/blenlib/intern/math_vector_inline.c
branches/cycles/source/blender/blenlib/intern/noise.c
branches/cycles/source/blender/blenlib/intern/storage.c
branches/cycles/source/blender/blenlib/intern/string.c
branches/cycles/source/blender/blenloader/intern/readblenentry.c
branches/cycles/source/blender/blenloader/intern/readfile.c
branches/cycles/source/blender/blenloader/intern/writefile.c
branches/cycles/source/blender/blenpluginapi/iff.h
branches/cycles/source/blender/collada/AnimationImporter.cpp
branches/cycles/source/blender/collada/AnimationImporter.h
branches/cycles/source/blender/collada/ArmatureExporter.cpp
branches/cycles/source/blender/collada/ArmatureExporter.h
branches/cycles/source/blender/collada/ArmatureImporter.cpp
branches/cycles/source/blender/collada/ArmatureImporter.h
branches/cycles/source/blender/collada/CMakeLists.txt
branches/cycles/source/blender/collada/CameraExporter.cpp
branches/cycles/source/blender/collada/DocumentExporter.cpp
branches/cycles/source/blender/collada/DocumentImporter.cpp
branches/cycles/source/blender/collada/DocumentImporter.h
branches/cycles/source/blender/collada/EffectExporter.cpp
branches/cycles/source/blender/collada/ExtraHandler.cpp
branches/cycles/source/blender/collada/ExtraHandler.h
branches/cycles/source/blender/collada/GeometryExporter.h
branches/cycles/source/blender/collada/LightExporter.cpp
branches/cycles/source/blender/collada/SkinInfo.cpp
branches/cycles/source/blender/collada/TransformReader.cpp
branches/cycles/source/blender/collada/TransformWriter.cpp
branches/cycles/source/blender/editors/animation/anim_channels_defines.c
branches/cycles/source/blender/editors/animation/anim_channels_edit.c
branches/cycles/source/blender/editors/animation/anim_deps.c
branches/cycles/source/blender/editors/animation/anim_draw.c
branches/cycles/source/blender/editors/animation/anim_filter.c
branches/cycles/source/blender/editors/animation/anim_intern.h
branches/cycles/source/blender/editors/animation/anim_ipo_utils.c
branches/cycles/source/blender/editors/animation/anim_markers.c
branches/cycles/source/blender/editors/animation/anim_ops.c
branches/cycles/source/blender/editors/animation/drivers.c
branches/cycles/source/blender/editors/animation/fmodifier_ui.c
branches/cycles/source/blender/editors/animation/keyframes_draw.c
branches/cycles/source/blender/editors/animation/keyframes_edit.c
branches/cycles/source/blender/editors/animation/keyframes_general.c
branches/cycles/source/blender/editors/animation/keyframing.c
branches/cycles/source/blender/editors/animation/keyingsets.c
branches/cycles/source/blender/editors/armature/armature_intern.h
branches/cycles/source/blender/editors/armature/armature_ops.c
branches/cycles/source/blender/editors/armature/editarmature.c
branches/cycles/source/blender/editors/armature/poseSlide.c
branches/cycles/source/blender/editors/armature/poseUtils.c
branches/cycles/source/blender/editors/armature/poselib.c
branches/cycles/source/blender/editors/armature/poseobject.c
branches/cycles/source/blender/editors/datafiles/blenderbuttons.c
branches/cycles/source/blender/editors/gpencil/drawgpencil.c
branches/cycles/source/blender/editors/gpencil/editaction_gpencil.c
branches/cycles/source/blender/editors/gpencil/gpencil_buttons.c
branches/cycles/source/blender/editors/gpencil/gpencil_edit.c
branches/cycles/source/blender/editors/gpencil/gpencil_intern.h
branches/cycles/source/blender/editors/gpencil/gpencil_ops.c
branches/cycles/source/blender/editors/gpencil/gpencil_paint.c
branches/cycles/source/blender/editors/include/ED_anim_api.h
branches/cycles/source/blender/editors/include/ED_gpencil.h
branches/cycles/source/blender/editors/include/ED_keyframes_draw.h
branches/cycles/source/blender/editors/include/ED_keyframes_edit.h
branches/cycles/source/blender/editors/include/ED_keyframing.h
branches/cycles/source/blender/editors/include/ED_markers.h
branches/cycles/source/blender/editors/include/ED_view3d.h
branches/cycles/source/blender/editors/include/UI_icons.h
branches/cycles/source/blender/editors/include/UI_resources.h
branches/cycles/source/blender/editors/interface/interface.c
branches/cycles/source/blender/editors/interface/interface_anim.c
branches/cycles/source/blender/editors/interface/interface_draw.c
branches/cycles/source/blender/editors/interface/interface_handlers.c
branches/cycles/source/blender/editors/interface/interface_icons.c
branches/cycles/source/blender/editors/interface/interface_intern.h
branches/cycles/source/blender/editors/interface/interface_layout.c
branches/cycles/source/blender/editors/interface/interface_templates.c
branches/cycles/source/blender/editors/interface/resources.c
branches/cycles/source/blender/editors/mesh/editmesh_lib.c
branches/cycles/source/blender/editors/object/object_add.c
branches/cycles/source/blender/editors/object/object_bake.c
branches/cycles/source/blender/editors/object/object_constraint.c
branches/cycles/source/blender/editors/object/object_intern.h
branches/cycles/source/blender/editors/object/object_modifier.c
branches/cycles/source/blender/editors/object/object_ops.c
branches/cycles/source/blender/editors/object/object_relations.c
branches/cycles/source/blender/editors/object/object_select.c
branches/cycles/source/blender/editors/physics/particle_edit.c
branches/cycles/source/blender/editors/physics/physics_fluid.c
branches/cycles/source/blender/editors/physics/physics_pointcache.c
branches/cycles/source/blender/editors/render/render_preview.c
branches/cycles/source/blender/editors/render/render_shading.c
branches/cycles/source/blender/editors/screen/screen_edit.c
branches/cycles/source/blender/editors/screen/screen_ops.c
branches/cycles/source/blender/editors/sculpt_paint/paint_image.c
branches/cycles/source/blender/editors/sculpt_paint/sculpt.c
branches/cycles/source/blender/editors/sound/CMakeLists.txt
branches/cycles/source/blender/editors/sound/sound_ops.c
branches/cycles/source/blender/editors/space_action/action_draw.c
branches/cycles/source/blender/editors/space_action/action_edit.c
branches/cycles/source/blender/editors/space_action/action_intern.h
branches/cycles/source/blender/editors/space_action/action_ops.c
branches/cycles/source/blender/editors/space_action/action_select.c
branches/cycles/source/blender/editors/space_action/space_action.c
branches/cycles/source/blender/editors/space_buttons/buttons_context.c
branches/cycles/source/blender/editors/space_buttons/space_buttons.c
branches/cycles/source/blender/editors/space_console/space_console.c
branches/cycles/source/blender/editors/space_file/file_ops.c
branches/cycles/source/blender/editors/space_file/filelist.c
branches/cycles/source/blender/editors/space_file/fsmenu.c
branches/cycles/source/blender/editors/space_graph/graph_buttons.c
branches/cycles/source/blender/editors/space_graph/graph_draw.c
branches/cycles/source/blender/editors/space_graph/graph_edit.c
branches/cycles/source/blender/editors/space_graph/graph_ops.c
branches/cycles/source/blender/editors/space_graph/graph_select.c
branches/cycles/source/blender/editors/space_graph/graph_utils.c
branches/cycles/source/blender/editors/space_graph/space_graph.c
branches/cycles/source/blender/editors/space_image/image_buttons.c
branches/cycles/source/blender/editors/space_image/image_ops.c
branches/cycles/source/blender/editors/space_logic/logic_window.c
branches/cycles/source/blender/editors/space_nla/nla_buttons.c
branches/cycles/source/blender/editors/space_nla/nla_channels.c
branches/cycles/source/blender/editors/space_nla/nla_draw.c
branches/cycles/source/blender/editors/space_nla/nla_edit.c
branches/cycles/source/blender/editors/space_nla/nla_intern.h
branches/cycles/source/blender/editors/space_nla/nla_ops.c
branches/cycles/source/blender/editors/space_nla/nla_select.c
branches/cycles/source/blender/editors/space_nla/space_nla.c
branches/cycles/source/blender/editors/space_node/drawnode.c
branches/cycles/source/blender/editors/space_node/node_edit.c
branches/cycles/source/blender/editors/space_outliner/outliner_draw.c
branches/cycles/source/blender/editors/space_outliner/outliner_edit.c
branches/cycles/source/blender/editors/space_outliner/outliner_intern.h
branches/cycles/source/blender/editors/space_outliner/outliner_ops.c
branches/cycles/source/blender/editors/space_outliner/outliner_select.c
branches/cycles/source/blender/editors/space_outliner/outliner_tools.c
branches/cycles/source/blender/editors/space_outliner/outliner_tree.c
branches/cycles/source/blender/editors/space_outliner/space_outliner.c
branches/cycles/source/blender/editors/space_sequencer/SConscript
branches/cycles/source/blender/editors/space_sequencer/sequencer_add.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_draw.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_edit.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_intern.h
branches/cycles/source/blender/editors/space_sequencer/sequencer_ops.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_select.c
branches/cycles/source/blender/editors/space_sequencer/space_sequencer.c
branches/cycles/source/blender/editors/space_text/space_text.c
branches/cycles/source/blender/editors/space_text/text_draw.c
branches/cycles/source/blender/editors/space_text/text_intern.h
branches/cycles/source/blender/editors/space_text/text_ops.c
branches/cycles/source/blender/editors/space_time/space_time.c
branches/cycles/source/blender/editors/space_time/time_intern.h
branches/cycles/source/blender/editors/space_time/time_ops.c
branches/cycles/source/blender/editors/space_view3d/drawanimviz.c
branches/cycles/source/blender/editors/space_view3d/drawarmature.c
branches/cycles/source/blender/editors/space_view3d/drawmesh.c
branches/cycles/source/blender/editors/space_view3d/drawobject.c
branches/cycles/source/blender/editors/space_view3d/view3d_draw.c
branches/cycles/source/blender/editors/space_view3d/view3d_edit.c
branches/cycles/source/blender/editors/space_view3d/view3d_select.c
branches/cycles/source/blender/editors/space_view3d/view3d_view.c
branches/cycles/source/blender/editors/transform/transform.c
branches/cycles/source/blender/editors/transform/transform_conversions.c
branches/cycles/source/blender/editors/transform/transform_generics.c
branches/cycles/source/blender/editors/transform/transform_ops.c
branches/cycles/source/blender/editors/uvedit/uvedit_ops.c
branches/cycles/source/blender/gpu/intern/gpu_codegen.c
branches/cycles/source/blender/gpu/intern/gpu_draw.c
branches/cycles/source/blender/gpu/intern/gpu_extensions.c
branches/cycles/source/blender/gpu/intern/gpu_material.c
branches/cycles/source/blender/imbuf/CMakeLists.txt
branches/cycles/source/blender/imbuf/IMB_imbuf.h
branches/cycles/source/blender/imbuf/intern/IMB_anim.h
branches/cycles/source/blender/imbuf/intern/allocimbuf.c
branches/cycles/source/blender/imbuf/intern/anim_movie.c
branches/cycles/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/cycles/source/blender/imbuf/intern/filter.c
branches/cycles/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/cycles/source/blender/imbuf/intern/openexr/openexr_multi.h
branches/cycles/source/blender/imbuf/intern/rectop.c
branches/cycles/source/blender/imbuf/intern/thumbs.c
branches/cycles/source/blender/imbuf/intern/tiff.c
branches/cycles/source/blender/imbuf/intern/util.c
branches/cycles/source/blender/imbuf/intern/writeimage.c
branches/cycles/source/blender/makesdna/DNA_ID.h
branches/cycles/source/blender/makesdna/DNA_action_types.h
branches/cycles/source/blender/makesdna/DNA_actuator_types.h
branches/cycles/source/blender/makesdna/DNA_anim_types.h
branches/cycles/source/blender/makesdna/DNA_armature_types.h
branches/cycles/source/blender/makesdna/DNA_constraint_types.h
branches/cycles/source/blender/makesdna/DNA_curve_types.h
branches/cycles/source/blender/makesdna/DNA_gpencil_types.h
branches/cycles/source/blender/makesdna/DNA_ipo_types.h
branches/cycles/source/blender/makesdna/DNA_nla_types.h
branches/cycles/source/blender/makesdna/DNA_object_types.h
branches/cycles/source/blender/makesdna/DNA_scene_types.h
branches/cycles/source/blender/makesdna/DNA_sequence_types.h
branches/cycles/source/blender/makesdna/DNA_sound_types.h
branches/cycles/source/blender/makesdna/DNA_space_types.h
branches/cycles/source/blender/makesdna/DNA_userdef_types.h
branches/cycles/source/blender/makesdna/DNA_view3d_types.h
branches/cycles/source/blender/makesdna/DNA_windowmanager_types.h
branches/cycles/source/blender/makesdna/intern/makesdna.c
branches/cycles/source/blender/makesrna/RNA_access.h
branches/cycles/source/blender/makesrna/RNA_enum_types.h
branches/cycles/source/blender/makesrna/intern/CMakeLists.txt
branches/cycles/source/blender/makesrna/intern/makesrna.c
branches/cycles/source/blender/makesrna/intern/rna_ID.c
branches/cycles/source/blender/makesrna/intern/rna_access.c
branches/cycles/source/blender/makesrna/intern/rna_action.c
branches/cycles/source/blender/makesrna/intern/rna_actuator.c
branches/cycles/source/blender/makesrna/intern/rna_animation.c
branches/cycles/source/blender/makesrna/intern/rna_animation_api.c
branches/cycles/source/blender/makesrna/intern/rna_animviz.c
branches/cycles/source/blender/makesrna/intern/rna_armature.c
branches/cycles/source/blender/makesrna/intern/rna_constraint.c
branches/cycles/source/blender/makesrna/intern/rna_curve.c
branches/cycles/source/blender/makesrna/intern/rna_define.c
branches/cycles/source/blender/makesrna/intern/rna_fcurve.c
branches/cycles/source/blender/makesrna/intern/rna_gpencil.c
branches/cycles/source/blender/makesrna/intern/rna_internal.h
branches/cycles/source/blender/makesrna/intern/rna_main.c
branches/cycles/source/blender/makesrna/intern/rna_main_api.c
branches/cycles/source/blender/makesrna/intern/rna_modifier.c
branches/cycles/source/blender/makesrna/intern/rna_nla.c
branches/cycles/source/blender/makesrna/intern/rna_nodetree.c
branches/cycles/source/blender/makesrna/intern/rna_object.c
branches/cycles/source/blender/makesrna/intern/rna_object_force.c
branches/cycles/source/blender/makesrna/intern/rna_particle.c
branches/cycles/source/blender/makesrna/intern/rna_pose.c
branches/cycles/source/blender/makesrna/intern/rna_scene.c
branches/cycles/source/blender/makesrna/intern/rna_sequencer.c
branches/cycles/source/blender/makesrna/intern/rna_sound.c
branches/cycles/source/blender/makesrna/intern/rna_space.c
branches/cycles/source/blender/makesrna/intern/rna_texture.c
branches/cycles/source/blender/makesrna/intern/rna_userdef.c
branches/cycles/source/blender/makesrna/intern/rna_wm.c
branches/cycles/source/blender/python/generic/bgl.c
branches/cycles/source/blender/python/intern/bpy_app_handlers.c
branches/cycles/source/blender/python/intern/bpy_intern_string.c
branches/cycles/source/blender/python/intern/bpy_operator.c
branches/cycles/source/blender/python/intern/bpy_props.c
branches/cycles/source/blender/python/intern/bpy_rna.c
branches/cycles/source/blender/python/intern/bpy_traceback.c
branches/cycles/source/blender/render/extern/include/RE_pipeline.h
branches/cycles/source/blender/render/intern/source/convertblender.c
branches/cycles/source/blender/render/intern/source/pipeline.c
branches/cycles/source/blender/render/intern/source/pointdensity.c
branches/cycles/source/blender/render/intern/source/render_texture.c
branches/cycles/source/blender/render/intern/source/shadeoutput.c
branches/cycles/source/blender/render/intern/source/zbuf.c
branches/cycles/source/blender/windowmanager/WM_api.h
branches/cycles/source/blender/windowmanager/intern/wm_event_system.c
branches/cycles/source/blender/windowmanager/intern/wm_init_exit.c
branches/cycles/source/blender/windowmanager/intern/wm_jobs.c
branches/cycles/source/blender/windowmanager/intern/wm_keymap.c
branches/cycles/source/blender/windowmanager/intern/wm_operators.c
branches/cycles/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/cycles/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/cycles/source/gameengine/Converter/BL_ActionActuator.cpp
branches/cycles/source/gameengine/Converter/BL_ActionActuator.h
branches/cycles/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/cycles/source/gameengine/Converter/BL_ArmatureObject.h
branches/cycles/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/cycles/source/gameengine/Converter/BL_DeformableGameObject.cpp
branches/cycles/source/gameengine/Converter/BL_DeformableGameObject.h
branches/cycles/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/cycles/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/cycles/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/cycles/source/gameengine/Converter/BL_ShapeDeformer.h
branches/cycles/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/cycles/source/gameengine/Converter/BL_SkinDeformer.h
branches/cycles/source/gameengine/Converter/BlenderWorldInfo.cpp
branches/cycles/source/gameengine/Converter/CMakeLists.txt
branches/cycles/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
branches/cycles/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
branches/cycles/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/cycles/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/cycles/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/cycles/source/gameengine/Converter/KX_ConvertControllers.cpp
branches/cycles/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/cycles/source/gameengine/Converter/KX_IpoConvert.cpp
branches/cycles/source/gameengine/Converter/KX_IpoConvert.h
branches/cycles/source/gameengine/Converter/SConscript
branches/cycles/source/gameengine/Expressions/InputParser.cpp
branches/cycles/source/gameengine/Expressions/PyObjectPlus.h
branches/cycles/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/cycles/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/cycles/source/gameengine/GameLogic/SCA_ISensor.h
branches/cycles/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/cycles/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/cycles/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/cycles/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
branches/cycles/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/cycles/source/gameengine/GameLogic/SCA_XORController.cpp
branches/cycles/source/gameengine/GamePlayer/common/bmfont.cpp
branches/cycles/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/cycles/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/cycles/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/cycles/source/gameengine/Ketsji/BL_Material.h
branches/cycles/source/gameengine/Ketsji/BL_Shader.cpp
branches/cycles/source/gameengine/Ketsji/CMakeLists.txt
branches/cycles/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
branches/cycles/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/cycles/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/cycles/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/cycles/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/cycles/source/gameengine/Ketsji/KX_Camera.cpp
branches/cycles/source/gameengine/Ketsji/KX_Dome.cpp
branches/cycles/source/gameengine/Ketsji/KX_GameObject.cpp
branches/cycles/source/gameengine/Ketsji/KX_GameObject.h
branches/cycles/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/cycles/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/cycles/source/gameengine/Ketsji/KX_Light.cpp
branches/cycles/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/cycles/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/cycles/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/cycles/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/cycles/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
branches/cycles/source/gameengine/Ketsji/KX_Scene.cpp
branches/cycles/source/gameengine/Ketsji/KX_Scene.h
branches/cycles/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/cycles/source/gameengine/Ketsji/KX_SoundActuator.h
branches/cycles/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/cycles/source/gameengine/Ketsji/SConscript
branches/cycles/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/cycles/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/cycles/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/cycles/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/cycles/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/cycles/source/gameengine/SceneGraph/SG_BBox.cpp
branches/cycles/source/gameengine/SceneGraph/SG_IObject.cpp
branches/cycles/source/gameengine/SceneGraph/SG_IObject.h
branches/cycles/source/gameengine/SceneGraph/SG_Spatial.cpp
branches/cycles/source/gameengine/VideoTexture/Exception.cpp
branches/cycles/source/gameengine/VideoTexture/FilterColor.h
branches/cycles/source/gameengine/VideoTexture/ImageBase.cpp
branches/cycles/source/gameengine/VideoTexture/ImageMix.cpp
branches/cycles/source/gameengine/VideoTexture/ImageRender.cpp
branches/cycles/source/gameengine/VideoTexture/ImageViewport.cpp
branches/cycles/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/cycles/source/gameengine/VideoTexture/blendVideoTex.cpp
branches/cycles/source/tests/check_deprecated.py
Added Paths:
-----------
branches/cycles/build_files/cmake/Modules/FindOpenCOLLADA.cmake
branches/cycles/doc/python_api/rst/info_gotcha.rst
branches/cycles/doc/python_api/rst/info_overview.rst
branches/cycles/doc/python_api/rst/info_quickstart.rst
branches/cycles/doc/python_api/rst/info_tips_and_tricks.rst
branches/cycles/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
branches/cycles/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
branches/cycles/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
branches/cycles/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
branches/cycles/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
branches/cycles/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h
branches/cycles/intern/audaspace/intern/AUD_AnimateableProperty.cpp
branches/cycles/intern/audaspace/intern/AUD_AnimateableProperty.h
branches/cycles/intern/audaspace/intern/AUD_FileWriter.cpp
branches/cycles/intern/audaspace/intern/AUD_FileWriter.h
branches/cycles/intern/audaspace/intern/AUD_I3DHandle.h
branches/cycles/intern/audaspace/intern/AUD_IHandle.h
branches/cycles/intern/audaspace/intern/AUD_IWriter.h
branches/cycles/intern/audaspace/intern/AUD_JOSResampleFactory.cpp
branches/cycles/intern/audaspace/intern/AUD_JOSResampleFactory.h
branches/cycles/intern/audaspace/intern/AUD_JOSResampleReader.cpp
branches/cycles/intern/audaspace/intern/AUD_JOSResampleReader.h
branches/cycles/intern/audaspace/intern/AUD_JOSResampleReaderCoeff.cpp
branches/cycles/intern/audaspace/intern/AUD_ReferenceHandler.cpp
branches/cycles/intern/audaspace/intern/AUD_ResampleReader.cpp
branches/cycles/intern/audaspace/intern/AUD_ResampleReader.h
branches/cycles/intern/audaspace/intern/AUD_SequencerEntry.cpp
branches/cycles/intern/audaspace/intern/AUD_SequencerEntry.h
branches/cycles/intern/audaspace/intern/AUD_SequencerHandle.cpp
branches/cycles/intern/audaspace/intern/AUD_SequencerHandle.h
branches/cycles/intern/audaspace/sndfile/AUD_SndFileWriter.cpp
branches/cycles/intern/audaspace/sndfile/AUD_SndFileWriter.h
branches/cycles/intern/tools/credits_svn_gen.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_speaker.py
branches/cycles/source/blender/blenkernel/BKE_speaker.h
branches/cycles/source/blender/blenkernel/intern/speaker.c
branches/cycles/source/blender/collada/AnimationExporter.cpp
branches/cycles/source/blender/collada/AnimationExporter.h
branches/cycles/source/blender/imbuf/intern/IMB_indexer.h
branches/cycles/source/blender/imbuf/intern/indexer.c
branches/cycles/source/blender/imbuf/intern/indexer_dv.c
branches/cycles/source/blender/makesdna/DNA_speaker_types.h
branches/cycles/source/blender/makesrna/intern/rna_speaker.c
branches/cycles/source/blender/makesrna/intern/rna_texture_api.c
branches/cycles/source/gameengine/Ketsji/BL_Action.cpp
branches/cycles/source/gameengine/Ketsji/BL_Action.h
branches/cycles/source/gameengine/Ketsji/BL_ActionManager.cpp
branches/cycles/source/gameengine/Ketsji/BL_ActionManager.h
Removed Paths:
-------------
branches/cycles/intern/audaspace/intern/AUD_DefaultMixer.cpp
branches/cycles/intern/audaspace/intern/AUD_DefaultMixer.h
Property Changed:
----------------
branches/cycles/
branches/cycles/source/blender/editors/render/render_update.c
branches/cycles/source/blender/editors/space_outliner/
branches/cycles/source/blender/editors/uvedit/uvedit_buttons.c
branches/cycles/source/blender/python/intern/
Property changes on: branches/cycles
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:37695-37700
/trunk/blender:36353-39669
+ /trunk:37695-37700
/trunk/blender:36353-39870
Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt 2011-09-02 12:26:57 UTC (rev 39871)
+++ branches/cycles/CMakeLists.txt 2011-09-02 12:33:29 UTC (rev 39872)
@@ -474,21 +474,20 @@
endif()
if(WITH_OPENCOLLADA)
- set(OPENCOLLADA /usr/local/opencollada CACHE PATH "OpenCollada Directory")
- mark_as_advanced(OPENCOLLADA)
- set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
- set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2)
- set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA})
+ find_package(OpenCOLLADA)
+ if(OPENCOLLADA_FOUND)
+ set(PCRE /usr CACHE PATH "PCRE Directory")
+ mark_as_advanced(PCRE)
+ set(PCRE_LIBPATH ${PCRE}/lib)
+ set(PCRE_LIB pcre)
- set(PCRE /usr CACHE PATH "PCRE Directory")
- mark_as_advanced(PCRE)
- set(PCRE_LIBPATH ${PCRE}/lib)
- set(PCRE_LIB pcre)
-
- set(EXPAT /usr CACHE PATH "Expat Directory")
- mark_as_advanced(EXPAT)
- set(EXPAT_LIBPATH ${EXPAT}/lib)
- set(EXPAT_LIB expat)
+ set(EXPAT /usr CACHE PATH "Expat Directory")
+ mark_as_advanced(EXPAT)
+ set(EXPAT_LIBPATH ${EXPAT}/lib)
+ set(EXPAT_LIB expat)
+ else()
+ set(WITH_OPENCOLLADA OFF)
+ endif()
endif()
if(WITH_MEM_JEMALLOC)
@@ -747,9 +746,15 @@
endif()
if(WITH_OPENCOLLADA)
- set(OPENCOLLADA_INCLUDE_DIR
- ${LIBDIR}/opencollada/include
+
+ set(OPENCOLLADA_INCLUDE_DIRS
+ ${LIBDIR}/opencollada/include/COLLADAStreamWriter/include
+ ${LIBDIR}/opencollada/include/COLLADABaseUtils/include
+ ${LIBDIR}/opencollada/include/COLLADAFramework/include
+ ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
+ ${LIBDIR}/opencollada/include/GeneratedSaxParser/include
)
+
set(OPENCOLLADA_LIBRARIES
${LIBDIR}/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
${LIBDIR}/opencollada/lib/OpenCOLLADAFramework.lib
@@ -917,7 +922,13 @@
if(WITH_OPENCOLLADA)
set(OPENCOLLADA ${LIBDIR}/gcc/opencollada)
- set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include)
+ set(OPENCOLLADA_INCLUDE_DIRS
+ ${LIBDIR}/gcc/opencollada/include/COLLADAStreamWriter/include
+ ${LIBDIR}/gcc/opencollada/include/COLLADABaseUtils/include
+ ${LIBDIR}/gcc/opencollada/include/COLLADAFramework/include
+ ${LIBDIR}/gcc/opencollada/include/COLLADASaxFrameworkLoader/include
+ ${LIBDIR}/gcc/opencollada/include/GeneratedSaxParser/include
+ )
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
set(PCRE_LIB pcre)
@@ -1017,7 +1028,7 @@
# we use precompiled libraries for py 3.2 and up by default
# normally cached but not since we include them with blender
- set(PYTHON_VERSION 3.2)
+ set(PYTHON_VERSION 3.2)
set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")
# set(PYTHON_BINARY "${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
set(PYTHON_LIBRARY python${PYTHON_VERSION})
@@ -1128,7 +1139,15 @@
if(WITH_OPENCOLLADA)
set(OPENCOLLADA ${LIBDIR}/opencollada)
- set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include)
+
+ set(OPENCOLLADA_INCLUDE_DIRS
+ ${LIBDIR}/opencollada/include/COLLADAStreamWriter
+ ${LIBDIR}/opencollada/include/COLLADABaseUtils
+ ${LIBDIR}/opencollada/include/COLLADAFramework
+ ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader
+ ${LIBDIR}/opencollada/include/GeneratedSaxParser
+ )
+
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa" )
#pcre is bundled with openCollada
Modified: branches/cycles/SConstruct
===================================================================
--- branches/cycles/SConstruct 2011-09-02 12:26:57 UTC (rev 39871)
+++ branches/cycles/SConstruct 2011-09-02 12:33:29 UTC (rev 39872)
@@ -272,13 +272,13 @@
# for now, Mac builders must download and install the 3DxWare 10 Beta 4 driver framework from 3Dconnexion
# necessary header file lives here when installed:
# /Library/Frameworks/3DconnexionClient.framework/Versions/Current/Headers/ConnexionClientAPI.h
- if env['WITH_BF_3DMOUSE'] == 1 and not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'):
- print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
- env['WITH_BF_3DMOUSE'] = 0
- else:
- env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient'])
+ if env['WITH_BF_3DMOUSE'] == 1:
+ if not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'):
+ print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
+ env['WITH_BF_3DMOUSE'] = 0
+ else:
+ env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient'])
-
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
env['CCFLAGS'].append('/openmp')
Copied: branches/cycles/build_files/cmake/Modules/FindOpenCOLLADA.cmake (from rev 39870, trunk/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake)
===================================================================
--- branches/cycles/build_files/cmake/Modules/FindOpenCOLLADA.cmake (rev 0)
+++ branches/cycles/build_files/cmake/Modules/FindOpenCOLLADA.cmake 2011-09-02 12:33:29 UTC (rev 39872)
@@ -0,0 +1,118 @@
+# - Find OpenCOLLADA library
+# Find the native OpenCOLLADA includes and library
+# This module defines
+# OPENCOLLADA_INCLUDE_DIRS, where to find COLLADABaseUtils/ and
+# COLLADAFramework/, Set when OPENCOLLADA_INCLUDE_DIR is found.
+# OPENCOLLADA_LIBRARIES, libraries to link against to use OpenCOLLADA.
+# OPENCOLLADA_ROOT_DIR, The base directory to search for OpenCOLLADA.
+# This can also be an environment variable.
+# OPENCOLLADA_FOUND, If false, do not try to use OpenCOLLADA.
+#
+# also defined, but not for general use are
+# OPENCOLLADA_LIBRARY, where to find the OpenCOLLADA library.
+
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+
+# note about include paths, there are 2 ways includes are set
+#
+# Where '/usr/include/opencollada' is the root dir:
+# /usr/include/opencollada/COLLADABaseUtils/COLLADABUPlatform.h
+#
+# Where '/opt/opencollada' is the base dir:
+# /opt/opencollada/COLLADABaseUtils/include/COLLADABUPlatform.h
+
+# If OPENCOLLADA_ROOT_DIR was defined in the environment, use it.
+IF(NOT OPENCOLLADA_ROOT_DIR AND NOT $ENV{OPENCOLLADA_ROOT_DIR} STREQUAL "")
+ SET(OPENCOLLADA_ROOT_DIR $ENV{OPENCOLLADA_ROOT_DIR})
+ENDIF()
+
+SET(_opencollada_FIND_INCLUDES
+ COLLADAStreamWriter
+ COLLADABaseUtils
+ COLLADAFramework
+ COLLADASaxFrameworkLoader
+ GeneratedSaxParser
+)
+
+SET(_opencollada_FIND_COMPONENTS
+ OpenCOLLADAStreamWriter
+ OpenCOLLADASaxFrameworkLoader
+ OpenCOLLADAFramework
+ OpenCOLLADABaseUtils
+ GeneratedSaxParser
+ UTF
+ MathMLSolver
+ pcre
+ ftoa
+ buffer
+ xml2
+)
+
+SET(_opencollada_SEARCH_DIRS
+ ${OPENCOLLADA_ROOT_DIR}
+ /usr/local
+ /sw # Fink
+ /opt/local # DarwinPorts
+ /opt/csw # Blastwave
+)
+
+SET(_opencollada_INCLUDES)
+FOREACH(COMPONENT ${_opencollada_FIND_INCLUDES})
+ STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+
+ # need to use this even thouh we are looking for a dir
+ FIND_FILE(OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR
+ NAMES
+ ${COMPONENT}/include
+ ${COMPONENT}
+ # Ubuntu ppa needs this.
+ # Alternative would be to suffix all members of search path
+ # but this is less trouble, just looks strange.
+ include/opencollada/${COMPONENT}
+ HINTS
+ ${_opencollada_SEARCH_DIRS}
+ )
+ MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR)
+ LIST(APPEND _opencollada_INCLUDES "${OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR}")
+ENDFOREACH()
+
+
+SET(_opencollada_LIBRARIES)
+FOREACH(COMPONENT ${_opencollada_FIND_COMPONENTS})
+ STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+
+ FIND_LIBRARY(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY
+ NAMES
+ ${COMPONENT}
+ HINTS
+ ${_opencollada_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
+ # Ubuntu ppa needs this.
+ lib64/opencollada lib/opencollada
+ )
+ MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
+ LIST(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}")
+ENDFOREACH()
+
+
+# handle the QUIETLY and REQUIRED arguments and set OPENCOLLADA_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenCOLLADA DEFAULT_MSG
+ _opencollada_LIBRARIES _opencollada_INCLUDES)
+
+
+IF(OPENCOLLADA_FOUND)
+ SET(OPENCOLLADA_LIBRARIES ${_opencollada_LIBRARIES})
+ SET(OPENCOLLADA_INCLUDE_DIRS ${_opencollada_INCLUDES})
+ENDIF(OPENCOLLADA_FOUND)
Modified: branches/cycles/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/cycles/build_files/cmake/config/blender_lite.cmake 2011-09-02 12:26:57 UTC (rev 39871)
+++ branches/cycles/build_files/cmake/config/blender_lite.cmake 2011-09-02 12:33:29 UTC (rev 39872)
@@ -1,4 +1,4 @@
-# turn everything OFF CACHE FORCE BOOL) except for python which defaults to ON
+# turn everything OFF except for python which defaults to ON
# and is needed for the UI
#
# Example usage:
Modified: branches/cycles/build_files/cmake/packaging.cmake
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list