[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42026] branches/soc-2011-onion-uv-tools: merge with trunk 42025
Antony Riakiotakis
kalast at gmail.com
Mon Nov 21 11:20:36 CET 2011
Revision: 42026
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42026
Author: psy-fi
Date: 2011-11-21 10:20:35 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
merge with trunk 42025
Modified Paths:
--------------
branches/soc-2011-onion-uv-tools/CMakeLists.txt
branches/soc-2011-onion-uv-tools/GNUmakefile
branches/soc-2011-onion-uv-tools/SConstruct
branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-i686.py
branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-player-i686.py
branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2011-onion-uv-tools/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_consistency_check.py
branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_netbeans_project.py
branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2011-onion-uv-tools/build_files/cmake/config/blender_lite.cmake
branches/soc-2011-onion-uv-tools/build_files/cmake/macros.cmake
branches/soc-2011-onion-uv-tools/build_files/cmake/project_info.py
branches/soc-2011-onion-uv-tools/build_files/cmake/project_source_info.py
branches/soc-2011-onion-uv-tools/build_files/scons/config/darwin-config.py
branches/soc-2011-onion-uv-tools/build_files/scons/config/freebsd7-config.py
branches/soc-2011-onion-uv-tools/build_files/scons/config/freebsd8-config.py
branches/soc-2011-onion-uv-tools/build_files/scons/config/freebsd9-config.py
branches/soc-2011-onion-uv-tools/build_files/scons/config/linux-config.py
branches/soc-2011-onion-uv-tools/build_files/scons/config/linuxcross-config.py
branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-mingw-config.py
branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py
branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py
branches/soc-2011-onion-uv-tools/build_files/scons/tools/Blender.py
branches/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py
branches/soc-2011-onion-uv-tools/build_files/scons/tools/mstoolkit.py
branches/soc-2011-onion-uv-tools/doc/manpage/blender.1.py
branches/soc-2011-onion-uv-tools/doc/python_api/examples/bpy.app.handlers.1.py
branches/soc-2011-onion-uv-tools/doc/python_api/examples/bpy.app.handlers.py
branches/soc-2011-onion-uv-tools/doc/python_api/rst/info_gotcha.rst
branches/soc-2011-onion-uv-tools/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-onion-uv-tools/extern/CMakeLists.txt
branches/soc-2011-onion-uv-tools/extern/SConscript
branches/soc-2011-onion-uv-tools/intern/CMakeLists.txt
branches/soc-2011-onion-uv-tools/intern/SConscript
branches/soc-2011-onion-uv-tools/intern/audaspace/CMakeLists.txt
branches/soc-2011-onion-uv-tools/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2011-onion-uv-tools/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/soc-2011-onion-uv-tools/intern/audaspace/intern/AUD_LinearResampleReader.cpp
branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_Face2Face.cpp
branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_Interface.cpp
branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_Mesh.cpp
branches/soc-2011-onion-uv-tools/intern/bsp/intern/CSG_BooleanOps.cpp
branches/soc-2011-onion-uv-tools/intern/container/CTR_UHeap.h
branches/soc-2011-onion-uv-tools/intern/decimation/intern/LOD_QSDecimator.cpp
branches/soc-2011-onion-uv-tools/intern/ghost/GHOST_ISystem.h
branches/soc-2011-onion-uv-tools/intern/ghost/GHOST_ISystemPaths.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_System.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemPaths.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemPathsCocoa.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemPathsWin32.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemPathsX11.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2011-onion-uv-tools/intern/ghost/test/gears/GHOST_Test.cpp
branches/soc-2011-onion-uv-tools/intern/itasc/kdl/chain.hpp
branches/soc-2011-onion-uv-tools/intern/itasc/kdl/tree.hpp
branches/soc-2011-onion-uv-tools/intern/memutil/MEM_CacheLimiter.h
branches/soc-2011-onion-uv-tools/release/bin/blender-softwaregl
branches/soc-2011-onion-uv-tools/release/datafiles/blender_icons.png
branches/soc-2011-onion-uv-tools/release/datafiles/fonts/droidsans.ttf.gz
branches/soc-2011-onion-uv-tools/release/plugins/sequence/dnr.c
branches/soc-2011-onion-uv-tools/release/plugins/sequence/gamma.c
branches/soc-2011-onion-uv-tools/release/scripts/modules/addon_utils.py
branches/soc-2011-onion-uv-tools/release/scripts/modules/animsys_refactor.py
branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy/ops.py
branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy/path.py
branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/soc-2011-onion-uv-tools/release/scripts/modules/bpyml_ui.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/__init__.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/image.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/__init__.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_data_speaker.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_physics_common.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_physics_softbody.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_filebrowser.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_nla.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_time.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-onion-uv-tools/source/blender/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/SConscript
branches/soc-2011-onion-uv-tools/source/blender/avi/intern/avi.c
branches/soc-2011-onion-uv-tools/source/blender/blenfont/BLF_translation.h
branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_translation.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_anim.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_bmfont.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_bvhutils.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_camera.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_context.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_customdata.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_effect.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_fluidsim.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_idprop.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_image.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_library.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_main.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_modifier.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_node.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_object.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_paint.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_particle.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_scene.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_screen.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_texture.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/SConscript
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/BME_Customdata.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/BME_mesh.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/action.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/anim.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/armature.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/boids.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/brush.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/camera.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/collision.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/colortools.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/context.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/curve.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/displist.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/effect.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/fluidsim.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/idcode.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/idprop.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/image.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/implicit.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/key.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/lamp.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/library.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/material.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mball.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/modifier.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/multires.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/nla.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/node.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/object.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/particle.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/scene.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/speaker.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/text.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/texture.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/world.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_fnmatch.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_math_geom.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_math_vector.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_mempool.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_pbvh.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_threads.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_vfontdata.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/DLRB_tree.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/bpath.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/edgehash.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/graph.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_matrix.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/path_util.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/pbvh.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/scanfill.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/threads.c
branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readblenentry.c
branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.h
branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/writefile.c
branches/soc-2011-onion-uv-tools/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-onion-uv-tools/source/blender/collada/AnimationExporter.h
branches/soc-2011-onion-uv-tools/source/blender/collada/ArmatureExporter.cpp
branches/soc-2011-onion-uv-tools/source/blender/collada/ArmatureImporter.cpp
branches/soc-2011-onion-uv-tools/source/blender/collada/ArmatureImporter.h
branches/soc-2011-onion-uv-tools/source/blender/editors/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/editors/SConscript
branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_markers.c
branches/soc-2011-onion-uv-tools/source/blender/editors/armature/editarmature.c
branches/soc-2011-onion-uv-tools/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2011-onion-uv-tools/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2011-onion-uv-tools/source/blender/editors/armature/meshlaplacian.c
branches/soc-2011-onion-uv-tools/source/blender/editors/armature/poseobject.c
branches/soc-2011-onion-uv-tools/source/blender/editors/armature/reeb.c
branches/soc-2011-onion-uv-tools/source/blender/editors/curve/curve_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/curve/editcurve.c
branches/soc-2011-onion-uv-tools/source/blender/editors/datafiles/blender_icons.png.c
branches/soc-2011-onion-uv-tools/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2011-onion-uv-tools/source/blender/editors/gpencil/editaction_gpencil.c
branches/soc-2011-onion-uv-tools/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_curve.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_image.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_mesh.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_particle.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_sculpt.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_space_api.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_transform.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_uvedit.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_view3d.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/UI_icons.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/UI_interface.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/UI_resources.h
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_anim.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_icons.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_layout.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_panel.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_regions.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_style.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_templates.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/resources.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/view2d.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/view2d_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_add.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_bake.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_constraint.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_hook.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_lattice.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_modifier.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_select.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_transform.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_vgroup.c
branches/soc-2011-onion-uv-tools/source/blender/editors/physics/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/editors/physics/particle_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/physics/particle_object.c
branches/soc-2011-onion-uv-tools/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-onion-uv-tools/source/blender/editors/physics/physics_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/physics/physics_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_internal.c
branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_opengl.c
branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_shading.c
branches/soc-2011-onion-uv-tools/source/blender/editors/screen/area.c
branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screen_context.c
branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screen_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screen_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screendump.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_action/action_select.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_api/spacetypes.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/file_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/file_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_graph/graph_select.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/space_image.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_info/info_report.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_info/info_stats.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_info/textview.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_logic/logic_window.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_nla/nla_select.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/SConscript
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/drawnode.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_buttons.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_header.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_select.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_text/text_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_text/text_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/space_time/space_time.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform.h
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_generics.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_input.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_manipulator.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_orientations.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_snap.c
branches/soc-2011-onion-uv-tools/source/blender/editors/util/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/editors/util/crazyspace.c
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/gpu/GPU_material.h
branches/soc-2011-onion-uv-tools/source/blender/gpu/SConscript
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2011-onion-uv-tools/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2011-onion-uv-tools/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2011-onion-uv-tools/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/IMB_anim.h
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/IMB_indexer.h
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/indexer.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/jpeg.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/moviecache.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/png.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/scaling.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/thumbs_blend.c
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_ID.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_object_fluidsim.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_object_force.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_particle_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_texture_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/RNA_access.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/RNA_define.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/RNA_enum_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/RNA_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/SConscript
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_camera.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_context.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_controller.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_main.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_meta.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_pose.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_screen.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_text.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_text_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_texture_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_ui.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/modifiers/MOD_modifiertypes.h
branches/soc-2011-onion-uv-tools/source/blender/modifiers/SConscript
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_build.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_util.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_util.h
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/nodes/NOD_composite.h
branches/soc-2011-onion-uv-tools/source/blender/nodes/NOD_shader.h
branches/soc-2011-onion-uv-tools/source/blender/nodes/NOD_socket.h
branches/soc-2011-onion-uv-tools/source/blender/nodes/NOD_texture.h
branches/soc-2011-onion-uv-tools/source/blender/nodes/SConscript
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/node_composite_util.h
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_common.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_math.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_setalpha.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_value.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/intern/node_common.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/intern/node_exec.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/intern/node_socket.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/intern/node_util.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/intern/node_util.h
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/node_shader_util.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/node_shader_util.h
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_common.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_output.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_value.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/node_texture_util.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/node_texture_util.h
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_at.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_checker.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_common.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_compose.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_coord.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_decompose.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_distance.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_image.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_math.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_output.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_rotate.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_translate.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_valToNor.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_viewer.c
branches/soc-2011-onion-uv-tools/source/blender/python/BPY_extern.h
branches/soc-2011-onion-uv-tools/source/blender/python/SConscript
branches/soc-2011-onion-uv-tools/source/blender/python/generic/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/python/generic/noise_py_api.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_driver.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_driver.h
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_interface.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_props.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2011-onion-uv-tools/source/blender/render/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-onion-uv-tools/source/blender/render/extern/include/RE_render_ext.h
branches/soc-2011-onion-uv-tools/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2011-onion-uv-tools/source/blender/render/intern/include/pointdensity.h
branches/soc-2011-onion-uv-tools/source/blender/render/intern/include/render_types.h
branches/soc-2011-onion-uv-tools/source/blender/render/intern/include/rendercore.h
branches/soc-2011-onion-uv-tools/source/blender/render/intern/include/texture.h
branches/soc-2011-onion-uv-tools/source/blender/render/intern/include/voxeldata.h
branches/soc-2011-onion-uv-tools/source/blender/render/intern/include/zbuf.h
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/convertblender.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/envmap.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/external_engine.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/imagetexture.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/initrender.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/occlusion.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pipeline.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pixelshading.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pointdensity.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/rayshade.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/render_texture.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/rendercore.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/shadbuf.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/shadeoutput.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/sss.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/strand.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/volume_precache.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/volumetric.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/voxeldata.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/zbuf.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/WM_api.h
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/WM_keymap.h
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/WM_types.h
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_apple.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-onion-uv-tools/source/blenderplayer/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-onion-uv-tools/source/creator/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/creator/creator.c
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/IntValue.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_IpoActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_NearSensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/VideoTexture/Texture.h
branches/soc-2011-onion-uv-tools/source/tests/pep8.py
Added Paths:
-----------
branches/soc-2011-onion-uv-tools/build_files/cmake/Modules/FindOpenImageIO.cmake
branches/soc-2011-onion-uv-tools/extern/libmv/
branches/soc-2011-onion-uv-tools/intern/cycles/
branches/soc-2011-onion-uv-tools/release/scripts/presets/camera/Sony_A55.py
branches/soc-2011-onion-uv-tools/release/scripts/presets/cycles/
branches/soc-2011-onion-uv-tools/release/scripts/presets/tracking_camera/
branches/soc-2011-onion-uv-tools/release/scripts/presets/tracking_track_color/
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/clip.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_dynamicpaint.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_movieclip.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_ocean.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_tracking.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/ocean.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_clip.h
branches/soc-2011-onion-uv-tools/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_templates.c
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_movieclip_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_dynamicpaint.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_transform.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_add_shader.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_background.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_emission.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_fresnel.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_geometry.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_holdout.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_output_material.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_output_world.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
branches/soc-2011-onion-uv-tools/source/blender/python/generic/idprop_py_api.c
branches/soc-2011-onion-uv-tools/source/blender/python/generic/idprop_py_api.h
branches/soc-2011-onion-uv-tools/source/blender/render/intern/include/texture_ocean.h
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/texture_ocean.c
Removed Paths:
-------------
branches/soc-2011-onion-uv-tools/doc/python_api/epy/testbgl.py
branches/soc-2011-onion-uv-tools/extern/Eigen2/
branches/soc-2011-onion-uv-tools/source/blender/python/generic/IDProp.c
branches/soc-2011-onion-uv-tools/source/blender/python/generic/IDProp.h
Property Changed:
----------------
branches/soc-2011-onion-uv-tools/
branches/soc-2011-onion-uv-tools/release/scripts/
branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39665-41579
+ /trunk/blender:39665-42025
Modified: branches/soc-2011-onion-uv-tools/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/CMakeLists.txt 2011-11-20 23:44:50 UTC (rev 42025)
+++ branches/soc-2011-onion-uv-tools/CMakeLists.txt 2011-11-21 10:20:35 UTC (rev 42026)
@@ -171,6 +171,7 @@
option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
option(WITH_MOD_CLOTH_ELTOPO "Enable Experemental cloth solver" OFF)
mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
+option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)
# Image format support
option(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
@@ -202,6 +203,9 @@
option(WITH_LZO "Enable fast LZO compression (used for pointcache)" ON)
option(WITH_LZMA "Enable best LZMA compression, (used for pointcache)" ON)
+# Camera/motion tracking
+option(WITH_LIBMV "Enable libmv structure from motion library" ON)
+
# Misc
option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
@@ -210,6 +214,13 @@
endif()
option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON)
+# Cycles
+option(WITH_CYCLES "Enable cycles Render Engine" ON)
+option(WITH_CYCLES_TEST "Build cycles test application" OFF)
+option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
+set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
+mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
+
# disable for now, but plan to support on all platforms eventually
option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
mark_as_advanced(WITH_MEM_JEMALLOC)
@@ -276,11 +287,21 @@
"line if youre a developer who wants to add support.")
endif()
+if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
+ message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON")
+endif()
+
# may as well build python module without a UI
if(WITH_PYTHON_MODULE)
set(WITH_HEADLESS ON)
endif()
+# auto enable openimageio and boost for cycles
+if(WITH_CYCLES)
+ set(WITH_OPENIMAGEIO ON)
+ set(WITH_BOOST ON)
+endif()
+
TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
# don't store paths to libs for portable distrobution
@@ -346,6 +367,19 @@
set(CMAKE_LIBRARY_PATH "/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
endif()
+ # set lib directory if it exists
+ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+ set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/linux64)
+ else()
+ set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/linux)
+ endif()
+
+ if(NOT EXISTS ${LIBDIR})
+ unset(LIBDIR)
+ endif()
+ endif()
+
find_package(JPEG REQUIRED)
find_package(PNG REQUIRED)
find_package(ZLIB REQUIRED)
@@ -420,10 +454,17 @@
endif()
if(WITH_CODEC_FFMPEG)
- set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
+ # use lib dir if available and nothing else specified
+ if(LIBDIR AND NOT FFMPEG)
+ set(FFMPEG ${LIBDIR}/ffmpeg CACHE PATH "FFMPEG Directory")
+ set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale dirac_encoder mp3lame ogg orc-0.4 schroedinger-1.0 theora theoraenc theoradec vorbis vorbisenc vpx x264 xvidcore faad asound CACHE STRING "FFMPEG Libraries")
+ else()
+ set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
+ set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
+ endif()
+
mark_as_advanced(FFMPEG)
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
- set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
mark_as_advanced(FFMPEG_LIBRARIES)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
@@ -488,6 +529,45 @@
endif()
endif()
+ if(WITH_BOOST)
+ # uses in build instructions to override include and library variables
+ if(NOT BOOST_CUSTOM)
+ # use lib dir if available and nothing else specified
+ if(LIBDIR AND NOT BOOST_ROOT)
+ set(BOOST_ROOT ${LIBDIR}/boost)
+ set(Boost_USE_MULTITHREADED OFF)
+ else()
+ set(Boost_USE_MULTITHREADED ON)
+ endif()
+ find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
+ mark_as_advanced(Boost_DIR) # why doesnt boost do this?
+ endif()
+
+ set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
+ set(BOOST_LIBRARIES ${Boost_LIBRARIES})
+ set(BOOST_LIBPATH ${Boost_LIBRARY_DIRS})
+ set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
+ endif()
+
+ if(WITH_OPENIMAGEIO)
+ # use lib dir if available and nothing else specified
+ if(LIBDIR AND NOT OPENIMAGEIO_ROOT_DIR)
+ set(OPENIMAGEIO_ROOT_DIR ${LIBDIR}/oiio)
+ endif()
+
+ find_package(OpenImageIO)
+
+ set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
+ set(OPENIMAGEIO_LIBPATH) # TODO, remove and reference the absolute path everywhere
+ set(OPENIMAGEIO_DEFINITIONS)
+
+ if(NOT OPENIMAGEIO_FOUND)
+ set(WITH_OPENIMAGEIO OFF)
+ set(WITH_CYCLES OFF)
+ message(STATUS "OpenImageIO not found, disabling WITH_CYCLES")
+ endif()
+ endif()
+
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
@@ -774,6 +854,28 @@
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
endif()
+ if(WITH_BOOST)
+ set(BOOST ${LIBDIR}/boost)
+ set(BOOST_INCLUDE_DIR ${BOOST}/include)
+ set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
+ set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.lib")
+ set(BOOST_LIBRARIES
+ optimized libboost_date_time-${BOOST_POSTFIX} libboost_filesystem-${BOOST_POSTFIX}
+ libboost_regex-${BOOST_POSTFIX} libboost_system-${BOOST_POSTFIX} libboost_thread-${BOOST_POSTFIX}
+ debug libboost_date_time-${BOOST_DEBUG_POSTFIX} libboost_filesystem-${BOOST_DEBUG_POSTFIX}
+ libboost_regex-${BOOST_DEBUG_POSTFIX} libboost_system-${BOOST_DEBUG_POSTFIX} libboost_thread-${BOOST_DEBUG_POSTFIX})
+ set(BOOST_LIBPATH ${BOOST}/lib)
+ set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
+ endif()
+
+ if(WITH_OPENIMAGEIO)
+ set(OPENIMAGEIO ${LIBDIR}/openimageio)
+ set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
+ set(OPENIMAGEIO_LIBRARIES OpenImageIO)
+ set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
+ set(OPENIMAGEIO_DEFINITIONS)
+ endif()
+
set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib")
# MSVC only, Mingw doesnt need
@@ -788,7 +890,7 @@
else()
# keep GCC specific stuff here
if(CMAKE_COMPILER_IS_GNUCC)
- set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32")
+ set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32 -lpsapi")
set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
@@ -884,8 +986,30 @@
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
endif()
- set(PLATFORM_LINKFLAGS "--stack,2097152")
+ if(WITH_BOOST)
+ set(BOOST ${LIBDIR}/boost)
+ set(BOOST_INCLUDE_DIR ${BOOST}/include)
+ set(BOOST_POSTFIX "mgw45-mt-s-1_47")
+ set(BOOST_DEBUG_POSTFIX "mgw45-mt-sd-1_47")
+ set(BOOST_LIBRARIES
+ optimized boost_date_time-${BOOST_POSTFIX} boost_filesystem-${BOOST_POSTFIX}
+ boost_regex-${BOOST_POSTFIX} boost_system-${BOOST_POSTFIX} boost_thread-${BOOST_POSTFIX}
+ debug boost_date_time-${BOOST_DEBUG_POSTFIX} boost_filesystem-${BOOST_DEBUG_POSTFIX}
+ boost_regex-${BOOST_DEBUG_POSTFIX} boost_system-${BOOST_DEBUG_POSTFIX} boost_thread-${BOOST_DEBUG_POSTFIX})
+ set(BOOST_LIBPATH ${BOOST}/lib/gcc)
+ set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB -DBOOST_THREAD_USE_LIB ")
+ endif()
+
+ if(WITH_OPENIMAGEIO)
+ set(OPENIMAGEIO ${LIBDIR}/gcc/openimageio)
+ set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
+ set(OPENIMAGEIO_LIBRARIES OpenImageIO)
+ set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
+ set(OPENIMAGEIO_DEFINITIONS)
+ endif()
+ set(PLATFORM_LINKFLAGS "-Xlinker --stack=2097152")
+
endif()
# used in many places so include globally, like OpenGL
@@ -1087,6 +1211,22 @@
# linker needs "-weak_framework 3DconnexionClient"
endif()
+ if(WITH_BOOST)
+ set(BOOST ${LIBDIR}/boost)
+ set(BOOST_INCLUDE_DIR ${BOOST}/include)
+ set(BOOST_LIBRARIES boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt)
+ set(BOOST_LIBPATH ${BOOST}/lib)
+ set(BOOST_DEFINITIONS)
+ endif()
+
+ if(WITH_OPENIMAGEIO)
+ set(OPENIMAGEIO ${LIBDIR}/openimageio)
+ set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
+ set(OPENIMAGEIO_LIBRARIES OpenImageIO ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES})
+ set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib ${JPEG_LIBPATH} ${PNG_LIBPATH} ${TIFF_LIBPATH} ${OPENEXR_LIBPATH} ${ZLIB_LIBPATH})
+ set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD")
+ endif()
+
set(EXETYPE MACOSX_BUNDLE)
set(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
@@ -1387,6 +1527,7 @@
info_cfg_option(WITH_FFTW3)
info_cfg_option(WITH_INTERNATIONAL)
info_cfg_option(WITH_INPUT_NDOF)
+ info_cfg_option(WITH_CYCLES)
info_cfg_text("Compiler Options:")
info_cfg_option(WITH_BUILDINFO)
@@ -1427,6 +1568,7 @@
info_cfg_option(WITH_MOD_BOOLEAN)
info_cfg_option(WITH_MOD_DECIMATE)
info_cfg_option(WITH_MOD_FLUID)
+ info_cfg_option(WITH_MOD_OCEANSIM)
info_cfg_text("")
Modified: branches/soc-2011-onion-uv-tools/GNUmakefile
===================================================================
--- branches/soc-2011-onion-uv-tools/GNUmakefile 2011-11-20 23:44:50 UTC (rev 42025)
+++ branches/soc-2011-onion-uv-tools/GNUmakefile 2011-11-21 10:20:35 UTC (rev 42026)
@@ -34,8 +34,11 @@
# Source and Build DIR's
BLENDER_DIR:=$(shell pwd -P)
BUILD_TYPE:=Release
-BUILD_CMAKE_ARGS:=
+ifndef BUILD_CMAKE_ARGS
+ BUILD_CMAKE_ARGS:=
+endif
+
ifndef BUILD_DIR
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list