« back to all changes in this revision
Viewing changes to intern/cycles/render/integrator.h
- Committer: Package Import Robot
- Date: 2013-03-06 12:08:47 UTC
- mfrom: (1.5.1) (14.1.8 experimental)
- Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
#1122888, #1147084)
* debian/control:
- Lower build-depends on libavcodec-dev since we're not
doing the libav9 transition in Ubuntu yet
#1122888, #1147084)
* debian/control:
- Lower build-depends on libavcodec-dev since we're not
doing the libav9 transition in Ubuntu yet
- .pc/0003-install_in_usr_share.patch
- .pc/0003-install_in_usr_share.patch/source
- .pc/0003-install_in_usr_share.patch/source/creator
- .pc/0007-do_not_use_version_number_in_system_path.patch
- .pc/0007-do_not_use_version_number_in_system_path.patch/source
- .pc/0007-do_not_use_version_number_in_system_path.patch/source/creator
- .pc/0008-look_for_droid_ttf_with_fontconfig.patch
- .pc/0008-look_for_droid_ttf_with_fontconfig.patch/build_files
- .pc/0008-look_for_droid_ttf_with_fontconfig.patch/build_files/cmake
- .pc/0008-look_for_droid_ttf_with_fontconfig.patch/build_files/cmake/Modules
- .pc/0008-look_for_droid_ttf_with_fontconfig.patch/source
- .pc/0008-look_for_droid_ttf_with_fontconfig.patch/source/blender
- .pc/0008-look_for_droid_ttf_with_fontconfig.patch/source/blender/blenfont
- .pc/0008-look_for_droid_ttf_with_fontconfig.patch/source/blender/blenfont/intern
- .pc/0008-look_for_droid_ttf_with_fontconfig.patch/source/blender/blenlib
- .pc/0008-look_for_droid_ttf_with_fontconfig.patch/source/blender/blenlib/intern
- .pc/0008-look_for_droid_ttf_with_fontconfig.patch/source/creator
- .pc/0009-fix_illegal_hardware_instruction_due_to_SSE2.patch
- .pc/0009-fix_illegal_hardware_instruction_due_to_SSE2.patch/build_files
- .pc/0009-fix_illegal_hardware_instruction_due_to_SSE2.patch/build_files/cmake
- .pc/0010-fix_format-security_issue.patch
- .pc/0010-fix_format-security_issue.patch/source
- .pc/0010-fix_format-security_issue.patch/source/blender
- .pc/0010-fix_format-security_issue.patch/source/blender/blenkernel
- .pc/0010-fix_format-security_issue.patch/source/blender/blenkernel/intern
- .pc/0010-fix_format-security_issue.patch/source/blender/editors
- .pc/0010-fix_format-security_issue.patch/source/blender/editors/transform
- .pc/0010-fix_format-security_issue.patch/source/blender/modifiers
- .pc/0010-fix_format-security_issue.patch/source/blender/modifiers/intern
- build_files/build_environment
- doc/python_api/rst/bge_types
- extern/Eigen3/Eigen/src/CholmodSupport
- extern/Eigen3/Eigen/src/IterativeLinearSolvers
- extern/Eigen3/Eigen/src/OrderingMethods
- extern/Eigen3/Eigen/src/PaStiXSupport
- extern/Eigen3/Eigen/src/PardisoSupport
- extern/Eigen3/Eigen/src/SparseCholesky
- extern/Eigen3/Eigen/src/SparseCore
- extern/Eigen3/Eigen/src/SuperLUSupport
- extern/Eigen3/Eigen/src/UmfPackSupport
- extern/bullet2/patches
- extern/libmv/third_party/ceres
- extern/libmv/third_party/ceres/include
- extern/libmv/third_party/ceres/include/ceres
- extern/libmv/third_party/ceres/include/ceres/internal
- extern/libmv/third_party/ceres/internal
- extern/libmv/third_party/ceres/internal/ceres
- extern/libmv/third_party/ceres/internal/ceres/generated
- extern/libmv/third_party/ceres/patches
- extern/rangetree
- intern/cycles/kernel/closure
- intern/cycles/kernel/shaders
- intern/locale
- intern/opencl
- intern/opencl/intern
- intern/opencolorio
- intern/raskter
- intern/rigidbody
- release/darwin
- release/darwin/blender.app
- release/darwin/blender.app/Contents
- release/darwin/blender.app/Contents/MacOS
- release/darwin/blender.app/Contents/Resources
- release/darwin/blenderplayer.app
- release/darwin/blenderplayer.app/Contents
- release/darwin/blenderplayer.app/Contents/MacOS
- release/darwin/blenderplayer.app/Contents/Resources
- release/darwin/set_simulation_threads.app
- release/darwin/set_simulation_threads.app/Contents
- release/darwin/set_simulation_threads.app/Contents/MacOS
- release/darwin/set_simulation_threads.app/Contents/Resources
- release/darwin/set_simulation_threads.app/Contents/Resources/Scripts
- release/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd
- release/datafiles/colormanagement
- release/datafiles/colormanagement/luts
- release/datafiles/locale/eo
- release/datafiles/locale/eo/LC_MESSAGES
- release/datafiles/locale/he
- release/datafiles/locale/he/LC_MESSAGES
- release/datafiles/locale/hi
- release/datafiles/locale/hi/LC_MESSAGES
- release/datafiles/locale/hu
- release/datafiles/locale/hu/LC_MESSAGES
- release/datafiles/locale/ko
- release/datafiles/locale/ko/LC_MESSAGES
- release/datafiles/locale/nl
- release/datafiles/locale/nl/LC_MESSAGES
- release/datafiles/locale/pt_BR
- release/datafiles/locale/pt_BR/LC_MESSAGES
- release/datafiles/matcaps
- release/scripts/addons/add_curve_extra_objects
- release/scripts/addons/compositing_film_response
- release/scripts/addons/io_export_dxf
- release/scripts/addons/io_export_dxf/draw_blenders
- release/scripts/addons/io_export_dxf/model
- release/scripts/addons/io_export_dxf/primitive_exporters
- release/scripts/addons/io_scene_ms3d
- release/scripts/addons/io_sequencer_edl
- release/scripts/addons/object_fracture_cell
- release/scripts/addons/render_renderfarmfi
- release/scripts/addons/ui_translate
- release/scripts/modules/bl_i18n_utils
- release/scripts/presets/operator
- release/scripts/presets/operator/wm.collada_export
- release/scripts/templates_osl
- release/scripts/templates_py
- source/blender/compositor
- source/blender/compositor/intern
- source/blender/compositor/nodes
- source/blender/compositor/operations
- source/blender/datatoc
- source/blender/editors/io
- source/blender/editors/mask
- source/blender/gpu/shaders
- source/tools/GL
- files removed:
- .pc/0003-install_in_usr_lib.patch
- .pc/0003-install_in_usr_lib.patch/intern
- .pc/0003-install_in_usr_lib.patch/intern/ghost
- .pc/0003-install_in_usr_lib.patch/intern/ghost/intern
- .pc/0003-install_in_usr_lib.patch/source
- .pc/0003-install_in_usr_lib.patch/source/creator
- .pc/0007-fix_FTBFS_with_ffmpeg_from_debian.patch
- .pc/0007-fix_FTBFS_with_ffmpeg_from_debian.patch/intern
- .pc/0007-fix_FTBFS_with_ffmpeg_from_debian.patch/intern/ffmpeg
- .pc/0007-fix_FTBFS_with_ffmpeg_from_debian.patch/source
- .pc/0007-fix_FTBFS_with_ffmpeg_from_debian.patch/source/blender
- .pc/0007-fix_FTBFS_with_ffmpeg_from_debian.patch/source/blender/blenkernel
- .pc/0007-fix_FTBFS_with_ffmpeg_from_debian.patch/source/blender/blenkernel/intern
- .pc/0008-do_not_use_version_number_in_the_system_path.patch
- .pc/0008-do_not_use_version_number_in_the_system_path.patch/source
- .pc/0008-do_not_use_version_number_in_the_system_path.patch/source/blender
- .pc/0008-do_not_use_version_number_in_the_system_path.patch/source/blender/blenlib
- .pc/0008-do_not_use_version_number_in_the_system_path.patch/source/blender/blenlib/intern
- .pc/0009-look_for_droid_ttf_with_fontconfig.patch
- .pc/0009-look_for_droid_ttf_with_fontconfig.patch/build_files
- .pc/0009-look_for_droid_ttf_with_fontconfig.patch/build_files/cmake
- .pc/0009-look_for_droid_ttf_with_fontconfig.patch/build_files/cmake/Modules
- .pc/0009-look_for_droid_ttf_with_fontconfig.patch/source
- .pc/0009-look_for_droid_ttf_with_fontconfig.patch/source/blender
- .pc/0009-look_for_droid_ttf_with_fontconfig.patch/source/blender/blenfont
- .pc/0009-look_for_droid_ttf_with_fontconfig.patch/source/blender/blenfont/intern
- .pc/0009-look_for_droid_ttf_with_fontconfig.patch/source/blender/blenlib
- .pc/0009-look_for_droid_ttf_with_fontconfig.patch/source/blender/blenlib/intern
- .pc/0009-look_for_droid_ttf_with_fontconfig.patch/source/creator
- .pc/fix-ftbfs-python-3.3.patch
- extern/Eigen3/Eigen/src/Sparse
- extern/eltopo
- extern/eltopo/common
- extern/eltopo/common/meshes
- extern/eltopo/common/newsparse
- extern/eltopo/common/sparse
- extern/eltopo/common/tunicate
- extern/eltopo/eltopo3d
- extern/eltopo/eltopo3d/obj
- extern/eltopo/eltopo3d/obj_debug
- intern/boolop
- intern/boolop/extern
- intern/boolop/intern
- intern/bsp/test
- intern/bsp/test/BSP_GhostTest
- intern/container/intern
- intern/cycles/kernel/osl/nodes
- intern/decimation
- intern/decimation/extern
- intern/decimation/intern
- intern/decimation/intern/future
- intern/decimation/test
- intern/decimation/test/decimate_glut_test
- intern/decimation/test/decimate_glut_test/intern
- intern/decimation/test/decimate_glut_test/intern/common
- intern/decimation/test/decimate_glut_test/intern/ply
- release/datafiles/locale/bg
- release/datafiles/locale/bg/LC_MESSAGES
- release/datafiles/locale/el
- release/datafiles/locale/el/LC_MESSAGES
- release/datafiles/locale/fi
- release/datafiles/locale/fi/LC_MESSAGES
- release/datafiles/locale/ne
- release/datafiles/locale/ne/LC_MESSAGES
- release/datafiles/locale/pl
- release/datafiles/locale/pl/LC_MESSAGES
- release/plugins
- release/plugins/sequence
- release/plugins/texture
- release/scripts/addons/io_scene_m3
- release/scripts/templates
- source/blender/blenpluginapi
- source/blender/blenpluginapi/intern
- source/darwin
- source/darwin/blender.app
- source/darwin/blender.app/Contents
- source/darwin/blender.app/Contents/MacOS
- source/darwin/blender.app/Contents/Resources
- source/darwin/blenderplayer.app
- source/darwin/blenderplayer.app/Contents
- source/darwin/blenderplayer.app/Contents/MacOS
- source/darwin/blenderplayer.app/Contents/Resources
- source/darwin/set_simulation_threads.app
- source/darwin/set_simulation_threads.app/Contents
- source/darwin/set_simulation_threads.app/Contents/MacOS
- source/darwin/set_simulation_threads.app/Contents/Resources
- source/darwin/set_simulation_threads.app/Contents/Resources/Scripts
- source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd
- files modified:
- .pc/0001-blender_thumbnailer.patch/source/creator/CMakeLists.txt
added
removed
intern/cycles/render/integrator.h
