[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41716] branches/soc-2011-cucumber: Merging revisions 41297-41712(HEAD) from Trunk
Daniel Stokes
kupomail at gmail.com
Thu Nov 10 05:13:10 CET 2011
Revision: 41716
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41716
Author: kupoman
Date: 2011-11-10 04:13:07 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
Merging revisions 41297-41712(HEAD) from Trunk
Modified Paths:
--------------
branches/soc-2011-cucumber/CMakeLists.txt
branches/soc-2011-cucumber/GNUmakefile
branches/soc-2011-cucumber/SConstruct
branches/soc-2011-cucumber/build_files/buildbot/config/user-config-i686.py
branches/soc-2011-cucumber/build_files/buildbot/config/user-config-player-i686.py
branches/soc-2011-cucumber/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2011-cucumber/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2011-cucumber/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2011-cucumber/build_files/cmake/cmake_consistency_check.py
branches/soc-2011-cucumber/build_files/cmake/cmake_consistency_check_config.py
branches/soc-2011-cucumber/build_files/cmake/cmake_netbeans_project.py
branches/soc-2011-cucumber/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2011-cucumber/build_files/cmake/config/blender_lite.cmake
branches/soc-2011-cucumber/build_files/cmake/macros.cmake
branches/soc-2011-cucumber/build_files/cmake/project_info.py
branches/soc-2011-cucumber/build_files/scons/config/darwin-config.py
branches/soc-2011-cucumber/build_files/scons/config/linux-config.py
branches/soc-2011-cucumber/build_files/scons/config/win32-mingw-config.py
branches/soc-2011-cucumber/build_files/scons/config/win32-vc-config.py
branches/soc-2011-cucumber/build_files/scons/config/win64-vc-config.py
branches/soc-2011-cucumber/build_files/scons/tools/Blender.py
branches/soc-2011-cucumber/build_files/scons/tools/btools.py
branches/soc-2011-cucumber/doc/doxygen/Doxyfile
branches/soc-2011-cucumber/doc/doxygen/doxygen.source
branches/soc-2011-cucumber/doc/python_api/rst/info_quickstart.rst
branches/soc-2011-cucumber/doc/python_api/rst/info_tips_and_tricks.rst
branches/soc-2011-cucumber/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-cucumber/extern/CMakeLists.txt
branches/soc-2011-cucumber/extern/SConscript
branches/soc-2011-cucumber/intern/CMakeLists.txt
branches/soc-2011-cucumber/intern/SConscript
branches/soc-2011-cucumber/intern/audaspace/CMakeLists.txt
branches/soc-2011-cucumber/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2011-cucumber/intern/audaspace/intern/AUD_C-API.h
branches/soc-2011-cucumber/intern/cycles/SConscript
branches/soc-2011-cucumber/intern/ghost/CMakeLists.txt
branches/soc-2011-cucumber/intern/ghost/SConscript
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_Buttons.h
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_DisplayManager.h
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_EventWheel.h
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2011-cucumber/intern/opennl/CMakeLists.txt
branches/soc-2011-cucumber/release/datafiles/fonts/droidsans.ttf.gz
branches/soc-2011-cucumber/release/scripts/modules/bpy/__init__.py
branches/soc-2011-cucumber/release/scripts/modules/bpy/ops.py
branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/soc-2011-cucumber/release/scripts/modules/bpyml_ui.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/__init__.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/image.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/__init__.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_filebrowser.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_nla.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_time.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-cucumber/source/blender/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/SConscript
branches/soc-2011-cucumber/source/blender/blenfont/BLF_translation.h
branches/soc-2011-cucumber/source/blender/blenfont/intern/blf_font.c
branches/soc-2011-cucumber/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-cucumber/source/blender/blenfont/intern/blf_translation.c
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_animsys.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_context.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_curve.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_customdata_file.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_deform.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_effect.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_global.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_image.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_lattice.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_library.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_main.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_node.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_object.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_particle.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_property.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_scene.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_screen.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_text.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_texture.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_unit.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_writeffmpeg.h
branches/soc-2011-cucumber/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/blenkernel/SConscript
branches/soc-2011-cucumber/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/action.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/anim.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/armature.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/blender.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/boids.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/brush.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/colortools.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/context.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/curve.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/customdata_file.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/deform.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/displist.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/effect.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/fluidsim.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/group.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/idcode.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/image.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/key.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/library.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/material.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/mball.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/node.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/object.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/particle.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/property.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/scene.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/screen.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/speaker.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/text.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/texture.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/unit.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/world.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-cucumber/source/blender/blenlib/BLI_bpath.h
branches/soc-2011-cucumber/source/blender/blenlib/BLI_callbacks.h
branches/soc-2011-cucumber/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2011-cucumber/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2011-cucumber/source/blender/blenlib/BLI_math_vector.h
branches/soc-2011-cucumber/source/blender/blenlib/BLI_path_util.h
branches/soc-2011-cucumber/source/blender/blenlib/BLI_string.h
branches/soc-2011-cucumber/source/blender/blenlib/BLI_threads.h
branches/soc-2011-cucumber/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/bpath.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/graph.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/path_util.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/pbvh.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/threads.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/uvproject.c
branches/soc-2011-cucumber/source/blender/blenloader/BLO_readfile.h
branches/soc-2011-cucumber/source/blender/blenloader/intern/readblenentry.c
branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.h
branches/soc-2011-cucumber/source/blender/blenloader/intern/writefile.c
branches/soc-2011-cucumber/source/blender/blenpluginapi/intern/pluginapi.c
branches/soc-2011-cucumber/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-cucumber/source/blender/collada/AnimationExporter.h
branches/soc-2011-cucumber/source/blender/collada/ArmatureImporter.cpp
branches/soc-2011-cucumber/source/blender/collada/ArmatureImporter.h
branches/soc-2011-cucumber/source/blender/collada/CameraExporter.cpp
branches/soc-2011-cucumber/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-cucumber/source/blender/editors/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/editors/SConscript
branches/soc-2011-cucumber/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2011-cucumber/source/blender/editors/animation/anim_draw.c
branches/soc-2011-cucumber/source/blender/editors/animation/anim_markers.c
branches/soc-2011-cucumber/source/blender/editors/animation/keyframes_general.c
branches/soc-2011-cucumber/source/blender/editors/animation/keyframing.c
branches/soc-2011-cucumber/source/blender/editors/armature/armature_intern.h
branches/soc-2011-cucumber/source/blender/editors/armature/editarmature.c
branches/soc-2011-cucumber/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2011-cucumber/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2011-cucumber/source/blender/editors/armature/meshlaplacian.c
branches/soc-2011-cucumber/source/blender/editors/armature/poseSlide.c
branches/soc-2011-cucumber/source/blender/editors/armature/poseUtils.c
branches/soc-2011-cucumber/source/blender/editors/armature/poseobject.c
branches/soc-2011-cucumber/source/blender/editors/armature/reeb.c
branches/soc-2011-cucumber/source/blender/editors/curve/curve_ops.c
branches/soc-2011-cucumber/source/blender/editors/curve/editcurve.c
branches/soc-2011-cucumber/source/blender/editors/curve/editfont.c
branches/soc-2011-cucumber/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2011-cucumber/source/blender/editors/gpencil/editaction_gpencil.c
branches/soc-2011-cucumber/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2011-cucumber/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-cucumber/source/blender/editors/include/ED_anim_api.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_armature.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_datafiles.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_fluidsim.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_logic.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_mesh.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_node.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_particle.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_render.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_screen.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_space_api.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_transform.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_uvedit.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_view3d.h
branches/soc-2011-cucumber/source/blender/editors/include/UI_icons.h
branches/soc-2011-cucumber/source/blender/editors/include/UI_interface.h
branches/soc-2011-cucumber/source/blender/editors/include/UI_resources.h
branches/soc-2011-cucumber/source/blender/editors/interface/interface.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_draw.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_icons.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_intern.h
branches/soc-2011-cucumber/source/blender/editors/interface/interface_ops.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_panel.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_regions.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_templates.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-cucumber/source/blender/editors/interface/resources.c
branches/soc-2011-cucumber/source/blender/editors/mesh/editface.c
branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh.c
branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-cucumber/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-cucumber/source/blender/editors/metaball/mball_edit.c
branches/soc-2011-cucumber/source/blender/editors/object/object_add.c
branches/soc-2011-cucumber/source/blender/editors/object/object_bake.c
branches/soc-2011-cucumber/source/blender/editors/object/object_constraint.c
branches/soc-2011-cucumber/source/blender/editors/object/object_edit.c
branches/soc-2011-cucumber/source/blender/editors/object/object_lattice.c
branches/soc-2011-cucumber/source/blender/editors/object/object_modifier.c
branches/soc-2011-cucumber/source/blender/editors/object/object_relations.c
branches/soc-2011-cucumber/source/blender/editors/object/object_transform.c
branches/soc-2011-cucumber/source/blender/editors/object/object_vgroup.c
branches/soc-2011-cucumber/source/blender/editors/physics/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/editors/physics/particle_edit.c
branches/soc-2011-cucumber/source/blender/editors/physics/particle_object.c
branches/soc-2011-cucumber/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-cucumber/source/blender/editors/render/render_internal.c
branches/soc-2011-cucumber/source/blender/editors/render/render_opengl.c
branches/soc-2011-cucumber/source/blender/editors/render/render_preview.c
branches/soc-2011-cucumber/source/blender/editors/render/render_shading.c
branches/soc-2011-cucumber/source/blender/editors/render/render_update.c
branches/soc-2011-cucumber/source/blender/editors/render/render_view.c
branches/soc-2011-cucumber/source/blender/editors/screen/area.c
branches/soc-2011-cucumber/source/blender/editors/screen/screen_context.c
branches/soc-2011-cucumber/source/blender/editors/screen/screen_edit.c
branches/soc-2011-cucumber/source/blender/editors/screen/screen_ops.c
branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-cucumber/source/blender/editors/sound/sound_ops.c
branches/soc-2011-cucumber/source/blender/editors/space_action/action_edit.c
branches/soc-2011-cucumber/source/blender/editors/space_api/spacetypes.c
branches/soc-2011-cucumber/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2011-cucumber/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2011-cucumber/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2011-cucumber/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2011-cucumber/source/blender/editors/space_console/console_ops.c
branches/soc-2011-cucumber/source/blender/editors/space_file/filelist.c
branches/soc-2011-cucumber/source/blender/editors/space_file/filelist.h
branches/soc-2011-cucumber/source/blender/editors/space_graph/graph_draw.c
branches/soc-2011-cucumber/source/blender/editors/space_graph/graph_edit.c
branches/soc-2011-cucumber/source/blender/editors/space_graph/graph_intern.h
branches/soc-2011-cucumber/source/blender/editors/space_image/image_draw.c
branches/soc-2011-cucumber/source/blender/editors/space_image/image_intern.h
branches/soc-2011-cucumber/source/blender/editors/space_image/image_ops.c
branches/soc-2011-cucumber/source/blender/editors/space_image/space_image.c
branches/soc-2011-cucumber/source/blender/editors/space_info/info_ops.c
branches/soc-2011-cucumber/source/blender/editors/space_info/textview.c
branches/soc-2011-cucumber/source/blender/editors/space_nla/nla_intern.h
branches/soc-2011-cucumber/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/editors/space_node/SConscript
branches/soc-2011-cucumber/source/blender/editors/space_node/drawnode.c
branches/soc-2011-cucumber/source/blender/editors/space_node/node_buttons.c
branches/soc-2011-cucumber/source/blender/editors/space_node/node_draw.c
branches/soc-2011-cucumber/source/blender/editors/space_node/node_edit.c
branches/soc-2011-cucumber/source/blender/editors/space_node/node_header.c
branches/soc-2011-cucumber/source/blender/editors/space_node/node_intern.h
branches/soc-2011-cucumber/source/blender/editors/space_node/space_node.c
branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-cucumber/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/editors/space_script/script_intern.h
branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-cucumber/source/blender/editors/space_text/text_header.c
branches/soc-2011-cucumber/source/blender/editors/space_text/text_ops.c
branches/soc-2011-cucumber/source/blender/editors/space_time/time_intern.h
branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform.h
branches/soc-2011-cucumber/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform_generics.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform_input.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform_ops.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform_orientations.c
branches/soc-2011-cucumber/source/blender/editors/util/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/editors/util/crazyspace.c
branches/soc-2011-cucumber/source/blender/editors/util/editmode_undo.c
branches/soc-2011-cucumber/source/blender/editors/util/undo.c
branches/soc-2011-cucumber/source/blender/editors/util/util_intern.h
branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-cucumber/source/blender/gpu/GPU_buffers.h
branches/soc-2011-cucumber/source/blender/gpu/GPU_extensions.h
branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2011-cucumber/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2011-cucumber/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2011-cucumber/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-cucumber/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2011-cucumber/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-cucumber/source/blender/imbuf/intern/moviecache.c
branches/soc-2011-cucumber/source/blender/imbuf/intern/readimage.c
branches/soc-2011-cucumber/source/blender/makesdna/DNA_ID.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_camera_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_texture_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_world_types.h
branches/soc-2011-cucumber/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-cucumber/source/blender/makesrna/RNA_access.h
branches/soc-2011-cucumber/source/blender/makesrna/RNA_types.h
branches/soc-2011-cucumber/source/blender/makesrna/SConscript
branches/soc-2011-cucumber/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_action.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_camera.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_camera_api.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_color.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_context.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_controller.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_key.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_main.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_screen.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_texture_api.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_world.c
branches/soc-2011-cucumber/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/modifiers/SConscript
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_build.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-cucumber/source/blender/nodes/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/nodes/NOD_composite.h
branches/soc-2011-cucumber/source/blender/nodes/NOD_shader.h
branches/soc-2011-cucumber/source/blender/nodes/SConscript
branches/soc-2011-cucumber/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-cucumber/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-cucumber/source/blender/nodes/composite/node_composite_util.h
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/soc-2011-cucumber/source/blender/nodes/intern/node_common.c
branches/soc-2011-cucumber/source/blender/nodes/intern/node_socket.c
branches/soc-2011-cucumber/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2011-cucumber/source/blender/nodes/shader/node_shader_util.c
branches/soc-2011-cucumber/source/blender/nodes/shader/node_shader_util.h
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_output.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_value.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/soc-2011-cucumber/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_image.c
branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2011-cucumber/source/blender/python/BPY_extern.h
branches/soc-2011-cucumber/source/blender/python/SConscript
branches/soc-2011-cucumber/source/blender/python/generic/IDProp.c
branches/soc-2011-cucumber/source/blender/python/generic/IDProp.h
branches/soc-2011-cucumber/source/blender/python/generic/bgl.c
branches/soc-2011-cucumber/source/blender/python/generic/bgl.h
branches/soc-2011-cucumber/source/blender/python/generic/blf_py_api.c
branches/soc-2011-cucumber/source/blender/python/generic/bpy_internal_import.c
branches/soc-2011-cucumber/source/blender/python/generic/bpy_internal_import.h
branches/soc-2011-cucumber/source/blender/python/generic/noise_py_api.c
branches/soc-2011-cucumber/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-cucumber/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/python/intern/bpy.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_app.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_driver.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_interface.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_interface_atexit.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_intern_string.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_library.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_operator.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_props.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna_array.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna_callback.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_traceback.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_util.c
branches/soc-2011-cucumber/source/blender/python/intern/gpu.c
branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils.c
branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils.h
branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Color.h
branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Euler.h
branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Matrix.h
branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Quaternion.h
branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Vector.h
branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_geometry.h
branches/soc-2011-cucumber/source/blender/python/simple_enum_gen.py
branches/soc-2011-cucumber/source/blender/quicktime/SConscript
branches/soc-2011-cucumber/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2011-cucumber/source/blender/render/extern/include/RE_engine.h
branches/soc-2011-cucumber/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-cucumber/source/blender/render/intern/include/render_types.h
branches/soc-2011-cucumber/source/blender/render/intern/include/rendercore.h
branches/soc-2011-cucumber/source/blender/render/intern/include/texture.h
branches/soc-2011-cucumber/source/blender/render/intern/include/zbuf.h
branches/soc-2011-cucumber/source/blender/render/intern/source/convertblender.c
branches/soc-2011-cucumber/source/blender/render/intern/source/envmap.c
branches/soc-2011-cucumber/source/blender/render/intern/source/external_engine.c
branches/soc-2011-cucumber/source/blender/render/intern/source/imagetexture.c
branches/soc-2011-cucumber/source/blender/render/intern/source/initrender.c
branches/soc-2011-cucumber/source/blender/render/intern/source/occlusion.c
branches/soc-2011-cucumber/source/blender/render/intern/source/pipeline.c
branches/soc-2011-cucumber/source/blender/render/intern/source/pixelshading.c
branches/soc-2011-cucumber/source/blender/render/intern/source/pointdensity.c
branches/soc-2011-cucumber/source/blender/render/intern/source/rayshade.c
branches/soc-2011-cucumber/source/blender/render/intern/source/render_texture.c
branches/soc-2011-cucumber/source/blender/render/intern/source/rendercore.c
branches/soc-2011-cucumber/source/blender/render/intern/source/shadbuf.c
branches/soc-2011-cucumber/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-cucumber/source/blender/render/intern/source/shadeoutput.c
branches/soc-2011-cucumber/source/blender/render/intern/source/sss.c
branches/soc-2011-cucumber/source/blender/render/intern/source/strand.c
branches/soc-2011-cucumber/source/blender/render/intern/source/volume_precache.c
branches/soc-2011-cucumber/source/blender/render/intern/source/voxeldata.c
branches/soc-2011-cucumber/source/blender/render/intern/source/zbuf.c
branches/soc-2011-cucumber/source/blender/windowmanager/WM_types.h
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-cucumber/source/blenderplayer/CMakeLists.txt
branches/soc-2011-cucumber/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-cucumber/source/creator/CMakeLists.txt
branches/soc-2011-cucumber/source/creator/creator.c
branches/soc-2011-cucumber/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-cucumber/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2011-cucumber/source/gameengine/Converter/BL_ArmatureActuator.h
branches/soc-2011-cucumber/source/gameengine/Converter/BL_ArmatureConstraint.h
branches/soc-2011-cucumber/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2011-cucumber/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2011-cucumber/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-cucumber/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/soc-2011-cucumber/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-cucumber/source/gameengine/Converter/KX_ConvertActuators.h
branches/soc-2011-cucumber/source/gameengine/Expressions/Expression.h
branches/soc-2011-cucumber/source/gameengine/Expressions/ListValue.cpp
branches/soc-2011-cucumber/source/gameengine/Expressions/ListValue.h
branches/soc-2011-cucumber/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2011-cucumber/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2011-cucumber/source/gameengine/Expressions/StringValue.h
branches/soc-2011-cucumber/source/gameengine/Expressions/Value.cpp
branches/soc-2011-cucumber/source/gameengine/Expressions/Value.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_ANDController.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_AlwaysSensor.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_DelaySensor.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_ExpressionController.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_IController.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_IObject.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_ISensor.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_NANDController.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_NORController.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_ORController.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_PropertyActuator.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_PythonController.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_PythonKeyboard.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_PythonMouse.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_RandomActuator.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_XNORController.h
branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_XORController.h
branches/soc-2011-cucumber/source/gameengine/GamePlayer/common/GPC_Engine.cpp
branches/soc-2011-cucumber/source/gameengine/GamePlayer/common/GPC_Engine.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_Shader.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_ArmatureSensor.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_CameraActuator.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_ConstraintWrapper.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_FontObject.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_GameActuator.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_IpoActuator.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_Light.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_MeshProxy.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_NavMeshObject.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_NearSensor.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_ParentActuator.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_PolyProxy.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_PythonInit.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_PythonSeq.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_RadarSensor.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_RaySensor.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_SceneActuator.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_SoundActuator.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_StateActuator.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_SteeringActuator.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_TouchSensor.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_VehicleWrapper.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_VertexProxy.h
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_VisibilityActuator.h
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_CameraData.h
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_FramingManager.cpp
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_FramingManager.h
branches/soc-2011-cucumber/source/gameengine/VideoTexture/BlendType.h
branches/soc-2011-cucumber/source/gameengine/VideoTexture/FilterBase.cpp
branches/soc-2011-cucumber/source/gameengine/VideoTexture/ImageBase.cpp
branches/soc-2011-cucumber/source/gameengine/VideoTexture/ImageRender.cpp
branches/soc-2011-cucumber/source/gameengine/VideoTexture/Texture.cpp
branches/soc-2011-cucumber/source/gameengine/VideoTexture/Texture.h
branches/soc-2011-cucumber/source/gameengine/VideoTexture/blendVideoTex.cpp
Added Paths:
-----------
branches/soc-2011-cucumber/build_files/cmake/Modules/FindOpenImageIO.cmake
branches/soc-2011-cucumber/doc/python_api/examples/bpy.app.handlers.1.py
branches/soc-2011-cucumber/doc/python_api/examples/bpy.app.handlers.py
branches/soc-2011-cucumber/extern/libmv/
branches/soc-2011-cucumber/intern/cycles/
branches/soc-2011-cucumber/release/datafiles/blender_icons.png
branches/soc-2011-cucumber/release/scripts/presets/camera/
branches/soc-2011-cucumber/release/scripts/presets/cycles/
branches/soc-2011-cucumber/release/scripts/presets/tracking_camera/
branches/soc-2011-cucumber/release/scripts/presets/tracking_track_color/
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/clip.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_camera.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_lamp.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_movieclip.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_tracking.h
branches/soc-2011-cucumber/source/blender/blenkernel/intern/camera.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/lamp.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-cucumber/source/blender/editors/datafiles/blender_icons.png.c
branches/soc-2011-cucumber/source/blender/editors/include/ED_clip.h
branches/soc-2011-cucumber/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2011-cucumber/source/blender/editors/space_clip/
branches/soc-2011-cucumber/source/blender/editors/space_node/node_templates.c
branches/soc-2011-cucumber/source/blender/makesdna/DNA_movieclip_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_transform.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_add_shader.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_background.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_emission.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_fresnel.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_geometry.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_holdout.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_output_material.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_output_world.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
Removed Paths:
-------------
branches/soc-2011-cucumber/po/
branches/soc-2011-cucumber/release/datafiles/blenderbuttons
branches/soc-2011-cucumber/release/datafiles/locale/
branches/soc-2011-cucumber/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2011-cucumber/source/blender/editors/space_script/script_header.c
branches/soc-2011-cucumber/source/blender/editors/space_sound/
Property Changed:
----------------
branches/soc-2011-cucumber/
branches/soc-2011-cucumber/build_files/
branches/soc-2011-cucumber/doc/
branches/soc-2011-cucumber/extern/
branches/soc-2011-cucumber/intern/
branches/soc-2011-cucumber/release/
branches/soc-2011-cucumber/release/datafiles/
branches/soc-2011-cucumber/source/blender/
branches/soc-2011-cucumber/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-cucumber
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36829-40545,40632-41297
/trunk/blender/source/darwin:41227-41228
+ /trunk/blender:36829-40545,40632-41712
/trunk/blender/source/darwin:41227-41228
Added: svn:externals
+
Modified: branches/soc-2011-cucumber/CMakeLists.txt
===================================================================
--- branches/soc-2011-cucumber/CMakeLists.txt 2011-11-10 04:03:08 UTC (rev 41715)
+++ branches/soc-2011-cucumber/CMakeLists.txt 2011-11-10 04:13:07 UTC (rev 41716)
@@ -65,7 +65,7 @@
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG _DEBUG)
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE NDEBUG)
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL NDEBUG)
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO DEBUG _DEBUG)
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO NDEBUG)
#-----------------------------------------------------------------------------
@@ -157,6 +157,8 @@
if(UNIX AND NOT APPLE)
option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
+ option(WITH_XDG_USER_DIRS "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
+ mark_as_advanced(WITH_XDG_USER_DIRS)
else()
# not an option for other OS's
set(WITH_BUILTIN_GLEW ON)
@@ -200,6 +202,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)
@@ -208,6 +213,10 @@
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)
+
# 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)
@@ -279,6 +288,12 @@
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
@@ -302,6 +317,9 @@
set(C_WARNINGS)
set(CXX_WARNINGS)
+# for gcc -Wno-blah-blah
+set(CC_REMOVE_STRICT_FLAGS)
+
# libraries to link the binary with passed to target_link_libraries()
# known as LLIBS to scons
set(PLATFORM_LINKLIBS "")
@@ -483,6 +501,34 @@
endif()
endif()
+ if(WITH_BOOST)
+
+ # uses in build instructions to override include and library variables
+ if(NOT BOOST_CUSTOM)
+ set(Boost_USE_MULTITHREADED ON)
+ find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
+ 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)
+ 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++")
@@ -769,6 +815,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
@@ -783,7 +851,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)
@@ -879,8 +947,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
@@ -1082,6 +1172,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")
@@ -1250,6 +1356,11 @@
# # this causes too many warnings, disable
# ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEFINED -Wundef)
+ # flags to undo strict flags
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_BUT_SET_VARIABLE -Wno-unused-but-set-variable)
+
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
@@ -1377,6 +1488,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)
Modified: branches/soc-2011-cucumber/GNUmakefile
===================================================================
--- branches/soc-2011-cucumber/GNUmakefile 2011-11-10 04:03:08 UTC (rev 41715)
+++ branches/soc-2011-cucumber/GNUmakefile 2011-11-10 04:13:07 UTC (rev 41716)
@@ -135,9 +135,6 @@
@echo " * package_pacman - build an arch linux pacmanpackage"
@echo " * package_archive - build an archive package"
@echo ""
- @echo "Other Targets (not assosiated with building blender)"
- @echo " * translations - update blenders translation files in po/"
- @echo ""
@echo "Testing Targets (not assosiated with building blender)"
@echo " * test - run ctest, currently tests import/export, operator execution and that python modules load"
@echo " * test_cmake - runs our own cmake file checker which detects errors in the cmake file list definitions"
@@ -151,6 +148,7 @@
@echo ""
@echo "Documentation Targets (not assosiated with building blender)"
@echo " * doc_py - generate sphinx python api docs"
+ @echo " * doc_doxy - generate doxygen C/C++ docs"
@echo " * doc_dna - generate blender file format reference"
@echo " * doc_man - generate manpage"
@echo ""
@@ -170,16 +168,6 @@
# -----------------------------------------------------------------------------
-# Other Targets
-#
-translations:
- $(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python po/update_msg.py
- python3 po/update_pot.py
- python3 po/update_po.py
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list