[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34997] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 34996.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Feb 20 00:51:41 CET 2011
Revision: 34997
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34997
Author: kjym3
Date: 2011-02-19 23:51:18 +0000 (Sat, 19 Feb 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 34996.
Conflicts resolved:
C:\bf-blender\soc-2008-mxcurioni\doc\python_api\sphinx_doc_gen.py
C:\bf-blender\soc-2008-mxcurioni\source\blender\makesrna\RNA_types.h
C:\bf-blender\soc-2008-mxcurioni\source\blender\render\SConscript
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34996
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/GNUmakefile
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
branches/soc-2008-mxcurioni/build_files/package_spec/build_debian.sh
branches/soc-2008-mxcurioni/build_files/package_spec/debian/control
branches/soc-2008-mxcurioni/build_files/package_spec/debian/copyright
branches/soc-2008-mxcurioni/build_files/package_spec/debian/docs
branches/soc-2008-mxcurioni/build_files/package_spec/debian/menu
branches/soc-2008-mxcurioni/build_files/package_spec/debian/rules
branches/soc-2008-mxcurioni/build_files/package_spec/pacman/PKGBUILD
branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/doc/Doxyfile
branches/soc-2008-mxcurioni/doc/doxygen.main
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.data.py
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
branches/soc-2008-mxcurioni/extern/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/SConscript
branches/soc-2008-mxcurioni/intern/audaspace/COPYING
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_AccumulatorFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ButterworthFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ButterworthFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DelayFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DelayFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DelayReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DelayReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DoubleFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DoubleFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DoubleReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DoubleReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EffectFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EffectFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EffectReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EffectReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EnvelopeFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_FaderFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_FaderFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_FaderReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_FaderReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_HighpassFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_HighpassFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_IIRFilterFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_IIRFilterFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_IIRFilterReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_IIRFilterReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LimiterFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LimiterFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LimiterReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LimiterReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LoopFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LoopFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LoopReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LoopReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LowpassFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LowpassFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PingPongFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PingPongFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PitchFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PitchFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PitchReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PitchReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ReverseFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ReverseFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ReverseReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ReverseReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SquareFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SquareFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SumFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SumFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SuperposeFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SuperposeFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SuperposeReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SuperposeReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_VolumeFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_VolumeFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soc-2008-mxcurioni/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2008-mxcurioni/intern/audaspace/Python/AUD_PyAPI.h
branches/soc-2008-mxcurioni/intern/audaspace/SDL/AUD_SDLDevice.cpp
branches/soc-2008-mxcurioni/intern/audaspace/SDL/AUD_SDLDevice.h
branches/soc-2008-mxcurioni/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/SRC/AUD_SRCResampleFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/SRC/AUD_SRCResampleReader.h
branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
branches/soc-2008-mxcurioni/intern/audaspace/fftw/AUD_BandPassFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/fftw/AUD_BandPassFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/fftw/AUD_BandPassReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/fftw/AUD_BandPassReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_3DMath.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Buffer.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Buffer.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_BufferReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_BufferReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ChannelMapperFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ChannelMapperReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterFunctions.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterFunctions.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_DefaultMixer.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_DefaultMixer.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_FileFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_FileFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_I3DDevice.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_IDevice.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_IFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_IReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_LinearResampleFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_LinearResampleFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_LinearResampleReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_LinearResampleReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Mixer.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Mixer.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_MixerFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_MixerFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_NULLDevice.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_NULLDevice.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_PyInit.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ReadDevice.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ReadDevice.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Reference.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ResampleFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SilenceFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SilenceFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SilenceReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SilenceReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SinusFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SinusFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SinusReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SinusReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SoftwareDevice.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Space.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_StreamBufferFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/jack/AUD_JackDevice.cpp
branches/soc-2008-mxcurioni/intern/audaspace/jack/AUD_JackDevice.h
branches/soc-2008-mxcurioni/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/sndfile/AUD_SndFileFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/sndfile/AUD_SndFileReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/sndfile/AUD_SndFileReader.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventPrinter.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2008-mxcurioni/intern/tools/bpy_introspect_ui.py
branches/soc-2008-mxcurioni/release/datafiles/ctodata.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/ui.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
branches/soc-2008-mxcurioni/release/scripts/modules/rna_info.py
branches/soc-2008-mxcurioni/release/scripts/modules/sys_info.py
branches/soc-2008-mxcurioni/release/scripts/op/fcurve_euler_filter.py
branches/soc-2008-mxcurioni/release/scripts/op/object.py
branches/soc-2008-mxcurioni/release/scripts/op/wm.py
branches/soc-2008-mxcurioni/release/scripts/templates/panel_simple.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_console.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_dopesheet.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_graph.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_logic.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_nla.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_text.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref_keymap.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/release/text/readme.html
branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_api.h
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_dir.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_font.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_lang.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_action.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_anim.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_animsys.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_armature.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_array_mallocn.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bmesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bmeshCustomData.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bmfont.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bmfont_types.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_boids.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_booleanops_mesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_brush.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bullet.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bvhutils.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cloth.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_collision.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_colortools.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_constraint.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_context.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_curve.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata_file.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_deform.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_displist.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_effect.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_endian.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_exotic.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fluidsim.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_font.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_global.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_gpencil.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_group.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_icons.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_idcode.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_idprop.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_ipo.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_key.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_lattice.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_main.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_material.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mball.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_modifier.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_multires.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_nla.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_packedFile.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_paint.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_particle.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_plugin_types.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_property.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_report.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sca.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_scene.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_screen.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_script.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_shrinkwrap.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sketch.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_smoke.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_softbody.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sound.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_subsurf.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_suggestions.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_text.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_texture.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_unit.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_world.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_writeavi.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_writeffmpeg.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_writeframeserver.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sound.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeavi.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_args.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_blenlib.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_boxpack2d.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_bpath.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_cpu.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_dlrbTree.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_dynstr.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_edgehash.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_editVert.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_fileops.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_fnmatch.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_ghash.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_graph.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_gsqueue.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_heap.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_jitter.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_kdtree.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_linklist.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_listbase.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_base.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_color.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_inline.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_memarena.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_mempool.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_noise.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_pbvh.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_rand.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_rect.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_scanfill.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_storage.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_storage_types.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_string.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_threads.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_uvproject.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_vfontdata.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_voxel.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_winstuff.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_args.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/jitter.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/noise.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/pbvh.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/rct.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/scanfill.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/time.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/uvproject.c
branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_readfile.h
branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_soundfile.h
branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_sys_types.h
branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_undofile.h
branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_writefile.h
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.h
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_general.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/BIF_retarget.h
branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poselib.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/reeb.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/reeb.h
branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_curve.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_gpencil.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_markers.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_uvedit.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_lattice.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_pointcache.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_context.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/space_action.c
branches/soc-2008-mxcurioni/source/blender/editors/space_api/spacetypes.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/space_console.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.h
branches/soc-2008-mxcurioni/source/blender/editors/space_file/space_file.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/space_graph.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_render.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_stats.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/space_info.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/space_logic.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/space_nla.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_state.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_script/space_script.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sound/space_sound.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/space_text.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_python.c
branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
branches/soc-2008-mxcurioni/source/blender/editors/space_time/time_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_userpref/space_userpref.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_constraints.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_input.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/util/crazyspace.c
branches/soc-2008-mxcurioni/source/blender/editors/util/editmode_undo.c
branches/soc-2008-mxcurioni/source/blender/editors/util/undo.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_buffers.h
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_vertex.glsl
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_vertex.glsl.c
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf.h
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/tiff.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_anim_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_armature_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_boid_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_brush_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_camera_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_cloth_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_color_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_controller_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_curve_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_documentation.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_effect_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_fileglobal_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_genfile.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_gpencil_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_group_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_image_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_key_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_listBase.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_material_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meta_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_nla_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_fluidsim.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_force.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_outliner_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_packedFile_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_property_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_screen_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sdna_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_smoke_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sound_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_text_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_vec_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_vfont_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view2d_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_world_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_define.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_brush.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_rna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2008-mxcurioni/source/blender/modifiers/SConscript
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_util.c
branches/soc-2008-mxcurioni/source/blender/python/BPY_extern.h
branches/soc-2008-mxcurioni/source/blender/python/generic/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/generic/IDProp.c
branches/soc-2008-mxcurioni/source/blender/python/generic/IDProp.h
branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.c
branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_geometry.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_geometry.h
branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
branches/soc-2008-mxcurioni/source/blender/python/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_driver.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator_wrap.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_array.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_callback.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_util.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_util.h
branches/soc-2008-mxcurioni/source/blender/readblenfile/BLO_readblenfile.h
branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/render/SConscript
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/imagetexture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pointdensity.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/renderdatabase.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeinput.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_event_types.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_files.h
branches/soc-2008-mxcurioni/source/blenderplayer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Expressions/InputParser.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/InputParser.h
branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/tests/batch_import.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/build_files/cmake/RpmBuild.cmake
branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.ops.1.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.ops.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.props.1.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.props.2.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.props.3.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.props.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Menu.1.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Menu.2.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Menu.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.1.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.2.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.3.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.4.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.5.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Panel.1.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Panel.2.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Panel.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.PropertyGroup.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.RenderEngine.py
branches/soc-2008-mxcurioni/intern/mikktspace/
branches/soc-2008-mxcurioni/intern/mikktspace/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/mikktspace/SConscript
branches/soc-2008-mxcurioni/intern/mikktspace/mikktspace.c
branches/soc-2008-mxcurioni/intern/mikktspace/mikktspace.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_documentation.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_Color.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_Color.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_Euler.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_Euler.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_Matrix.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_Matrix.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_Quaternion.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_Quaternion.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_Vector.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_Vector.h
branches/soc-2008-mxcurioni/source/blender/python/generic/noise_py_api.c
branches/soc-2008-mxcurioni/source/blender/python/generic/noise_py_api.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_driver.h
Removed Paths:
-------------
branches/soc-2008-mxcurioni/intern/audaspace/COPYING.LESSER
branches/soc-2008-mxcurioni/intern/mikktspace/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/mikktspace/SConscript
branches/soc-2008-mxcurioni/intern/mikktspace/mikktspace.c
branches/soc-2008-mxcurioni/intern/mikktspace/mikktspace.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_color.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_color.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_euler.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_euler.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_matrix.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_matrix.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_quat.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_quat.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_vector.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_vector.h
branches/soc-2008-mxcurioni/source/blender/python/generic/noise.c
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/build_files/package_spec/build_debian.sh
branches/soc-2008-mxcurioni/doc/
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:34011-34828
+ /trunk/blender:34011-34996
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2011-02-19 18:53:08 UTC (rev 34996)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2011-02-19 23:51:18 UTC (rev 34997)
@@ -28,8 +28,7 @@
#-----------------------------------------------------------------------------
# We don't allow in-source builds. This causes no end of troubles because
# all out-of-source builds will use the CMakeCache.txt file there and even
-# build the libs and objects in it. It will also conflict with the current
-# Makefile system for Blender
+# build the libs and objects in it.
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
message(FATAL_ERROR "CMake generation for blender is not allowed within the source directory!
@@ -39,11 +38,11 @@
cd ..
mkdir cmake-make
cd cmake-make
- cmake -G \"Unix Makefiles\" ../blender
+ cmake ../blender
")
endif()
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
# quiet output for Makefiles, 'make -s' helps too
# set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
@@ -227,6 +226,7 @@
# find_package(PythonLibs)
set(PYTHON /usr)
set(PYTHON_VERSION 3.1 CACHE STRING "")
+ mark_as_advanced(PYTHON_VERSION)
set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
mark_as_advanced(PYTHON_INCLUDE_DIRS)
# set(PYTHON_BINARY python) # not used yet
@@ -932,8 +932,15 @@
endif()
if(WITH_IMAGE_OPENJPEG)
- set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
- set(OPENJPEG_INC ${OPENJPEG})
+ if(UNIX AND NOT APPLE)
+ set(OPENJPEG /usr)
+ set(OPENJPEG_INC ${OPENJPEG}/include)
+ set(OPENJPEG_LIB openjpeg)
+ set(OPENJPEG_LIBPATH ${OPENJPEG}/lib)
+ else()
+ set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
+ set(OPENJPEG_INC ${OPENJPEG})
+ endif()
endif()
if(WITH_IMAGE_REDCODE)
@@ -1060,3 +1067,7 @@
if(WITH_PLAYER)
add_subdirectory(source/blenderplayer)
endif()
+
+#-----------------------------------------------------------------------------
+# CPack for generating packages
+include(build_files/cmake/packaging.cmake)
Modified: branches/soc-2008-mxcurioni/GNUmakefile
===================================================================
--- branches/soc-2008-mxcurioni/GNUmakefile 2011-02-19 18:53:08 UTC (rev 34996)
+++ branches/soc-2008-mxcurioni/GNUmakefile 2011-02-19 23:51:18 UTC (rev 34997)
@@ -37,6 +37,15 @@
BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
+# support 'make debug'
+ifneq "$(findstring debug, $(MAKECMDGOALS))" ""
+ BUILD_DIR:=$(BUILD_DIR)_debug
+ BUILD_TYPE:=Debug
+else
+ BUILD_TYPE:=Release
+endif
+
+
# Get the number of cores for threaded build
NPROCS:=1
ifeq ($(OS), Linux)
@@ -61,7 +70,7 @@
if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
mkdir -p $(BUILD_DIR) ; \
cd $(BUILD_DIR) ; \
- cmake $(BLENDER_DIR) -DCMAKE_BUILD_TYPE:STRING=Release ; \
+ cmake $(BLENDER_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
fi
@echo
@@ -71,4 +80,21 @@
@echo run blender from "$(BUILD_DIR)/bin/blender"
@echo
+debug: all
+ # pass
+
+# package types
+package_debian:
+ cd build_files/package_spec ; sh ./build_debian.sh
+
+package_pacman:
+ cd build_files/package_spec/pacman ; makepkg --asroot
+
+# forward build targets
+test:
+ cd $(BUILD_DIR) ; ctest . --output-on-failure
+
+clean:
+ cd $(BUILD_DIR) ; make clean
+
.PHONY: all
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2011-02-19 18:53:08 UTC (rev 34996)
+++ branches/soc-2008-mxcurioni/SConstruct 2011-02-19 23:51:18 UTC (rev 34997)
@@ -60,6 +60,10 @@
EnsureSConsVersion(1,0,0)
+# Before we do anything, let's check if we have a sane os.environ
+if not btools.check_environ():
+ Exit()
+
BlenderEnvironment = Blender.BlenderEnvironment
B = Blender
Copied: branches/soc-2008-mxcurioni/build_files/cmake/RpmBuild.cmake (from rev 34996, trunk/blender/build_files/cmake/RpmBuild.cmake)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/RpmBuild.cmake (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/cmake/RpmBuild.cmake 2011-02-19 23:51:18 UTC (rev 34997)
@@ -0,0 +1,17 @@
+#
+# VLMC RPM Finder
+# Authors: Rohit Yadav <rohityadav89 at gmail.com>
+#
+
+find_program(RPMBUILD
+ NAMES rpmbuild
+ PATHS "/usr/bin")
+
+if ( RPMBUILD )
+ get_filename_component(RPMBUILD_PATH ${RPMBUILD} ABSOLUTE)
+ message(STATUS "Found rpmbuild : ${RPMBUILD_PATH}")
+ set(RPMBUILD_FOUND "YES")
+else ( RPMBUILD )
+ message(STATUS "rpmbuild NOT found. RPM generation will not be available")
+ set(RPMBUILD_FOUND "NO")
+endif ( RPMBUILD )
Modified: branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py 2011-02-19 18:53:08 UTC (rev 34996)
+++ branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py 2011-02-19 23:51:18 UTC (rev 34997)
@@ -34,7 +34,7 @@
"/ik_glut_test/"
import os
-from os.path import join, dirname, normpath, abspath
+from os.path import join, dirname, normpath, abspath, splitext
base = join(os.path.dirname(__file__), "..", "..")
base = normpath(base)
@@ -45,10 +45,7 @@
global_h = set()
global_c = set()
-import os
-from os.path import splitext
-
def source_list(path, filename_check=None):
for dirpath, dirnames, filenames in os.walk(path):
@@ -62,11 +59,6 @@
# extension checking
-def is_c_header(filename):
- ext = splitext(filename)[1]
- return (ext in (".h", ".hpp", ".hxx"))
-
-
def is_cmake(filename):
ext = splitext(filename)[1]
return (ext == ".cmake") or (filename == "CMakeLists.txt")
Modified: branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py 2011-02-19 18:53:08 UTC (rev 34996)
+++ branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py 2011-02-19 23:51:18 UTC (rev 34997)
@@ -45,11 +45,6 @@
# extension checking
-def is_c_header(filename):
- ext = splitext(filename)[1]
- return (ext in (".h", ".hpp", ".hxx"))
-
-
def is_cmake(filename):
ext = splitext(filename)[1]
return (ext == ".cmake") or (filename == "CMakeLists.txt")
Modified: branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake 2011-02-19 18:53:08 UTC (rev 34996)
+++ branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake 2011-02-19 23:51:18 UTC (rev 34997)
@@ -85,6 +85,9 @@
if(WITH_IMAGE_TIFF)
link_directories(${TIFF_LIBPATH})
endif()
+ if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE)
+ link_directories(${OPENJPEG_LIBPATH})
+ endif()
if(WITH_LCMS)
link_directories(${LCMS_LIBPATH})
endif()
@@ -180,6 +183,9 @@
target_link_libraries(${target} ${OPENEXR_LIB})
endif()
endif()
+ if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE)
+ target_link_libraries(${target} ${OPENJPEG_LIB})
+ endif()
if(WITH_LCMS)
target_link_libraries(${target} ${LCMS_LIBRARY})
endif()
@@ -293,32 +299,14 @@
endmacro()
-
-# XXX, until cmake 2.8.4 is released.
-INCLUDE(CheckCSourceCompiles)
-MACRO (CHECK_C_COMPILER_FLAG__INTERNAL _FLAG _RESULT)
- SET(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
- SET(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
- CHECK_C_SOURCE_COMPILES("int main(void) { return 0;}" ${_RESULT}
- # Some compilers do not fail with a bad flag
- FAIL_REGEX "unrecognized .*option" # GNU
- FAIL_REGEX "ignoring unknown option" # MSVC
- FAIL_REGEX "[Uu]nknown option" # HP
- FAIL_REGEX "[Ww]arning: [Oo]ption" # SunPro
- FAIL_REGEX "command option .* is not recognized" # XL
- )
- SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
-ENDMACRO (CHECK_C_COMPILER_FLAG__INTERNAL)
-# XXX, end duplicate code.
-
macro(ADD_CHECK_C_COMPILER_FLAG
_CFLAGS
_CACHE_VAR
_FLAG)
- # include(CheckCCompilerFlag)
+ include(CheckCCompilerFlag)
- CHECK_C_COMPILER_FLAG__INTERNAL("${_FLAG}" "${_CACHE_VAR}")
+ CHECK_C_COMPILER_FLAG("${_FLAG}" "${_CACHE_VAR}")
if(${_CACHE_VAR})
# message(STATUS "Using CFLAG: ${_FLAG}")
set(${_CFLAGS} "${${_CFLAGS}} ${_FLAG}")
Copied: branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake (from rev 34996, trunk/blender/build_files/cmake/packaging.cmake)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake 2011-02-19 23:51:18 UTC (rev 34997)
@@ -0,0 +1,40 @@
+set(PROJECT_DESCRIPTION "Blender is a very fast and versatile 3D modeller/renderer.")
+set(PROJECT_COPYRIGHT "Copyright (C) 2001-2011 Blender Foundation")
+set(PROJECT_CONTACT "foundation at blender.org")
+set(PROJECT_VENDOR "Blender Foundation")
+set(ORG_WEBSITE "www.blender.org")
+
+set(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
+set(CPACK_PACKAGE_DESCRIPTION ${PROJECT_NAME_LONG})
+set(CPACK_PACKAGE_VENDOR ${PROJECT_VENDOR})
+set(CPACK_PACKAGE_CONTACT ${PROJECT_CONTACT})
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+
+# Force Package Name
+set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${CPACK_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
+
+# RPM packages
+include(build_files/cmake/RpmBuild.cmake)
+if(RPMBUILD_FOUND AND NOT WIN32)
+ set(CPACK_GENERATOR "RPM")
+ set(CPACK_SET_DESTDIR TRUE)
+ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
+endif(RPMBUILD_FOUND AND NOT WIN32)
+
+# Mac Bundle
+if(APPLE)
+ set(CPACK_GENERATOR "DragNDrop")
+
+ #Libraries are bundled directly
+ set(CPACK_COMPONENT_LIBRARIES_HIDDEN TRUE)
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list