Viewing all changes in revision 59.
- Committer: Reinhard Tartler
- Date: 2014-05-31 01:50:05 UTC
- mfrom: (14.2.27 sid)
- Revision ID: siretart@tauware.de-20140531015005-ml6druahuj82nsav
merge from debian
- files added:
- build_files/cmake/config/cycles_standalone.cmake
- extern/bullet2/src/BulletDynamics/Featherstone
- extern/bullet2/src/BulletDynamics/MLCPSolvers
- release/datafiles/blender_icons16
- release/datafiles/blender_icons32
- release/datafiles/locale/po
- release/scripts/addons/io_online_sketchfab
- release/scripts/addons/sequencer_extra_actions
- release/scripts/addons_contrib
- release/scripts/addons_contrib/add_mesh_building_objects
- release/scripts/addons_contrib/add_mesh_chain_rope
- release/scripts/addons_contrib/add_mesh_clusters
- release/scripts/addons_contrib/add_mesh_rocks
- release/scripts/addons_contrib/add_mesh_space_tree
- release/scripts/addons_contrib/btrace
- release/scripts/addons_contrib/chromoly_ruler
- release/scripts/addons_contrib/chromoly_ruler/va
- release/scripts/addons_contrib/cmu_mocap_browser
- release/scripts/addons_contrib/cursor_control
- release/scripts/addons_contrib/ewoc_projects_tools
- release/scripts/addons_contrib/geodesic_domes
- release/scripts/addons_contrib/geodesic_domes/tmp
- release/scripts/addons_contrib/io_atomblend_utilities
- release/scripts/addons_contrib/io_directx_bel
- release/scripts/addons_contrib/io_directx_bel/bel
- release/scripts/addons_contrib/io_mesh_gwyddion
- release/scripts/addons_contrib/io_mesh_xyz
- release/scripts/addons_contrib/io_points_pcd
- release/scripts/addons_contrib/io_scene_cod
- release/scripts/addons_contrib/io_scene_fpx
- release/scripts/addons_contrib/io_vector
- release/scripts/addons_contrib/mesh_extra_tools
- release/scripts/addons_contrib/mesh_select_tools
- release/scripts/addons_contrib/online_mat_lib
- release/scripts/addons_contrib/online_mat_lib/material-library
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/car-paint
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/effects
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/food
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/glass
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/groups
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/liquids
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/metals
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/nature
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/patterns
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/plastics
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/scripts
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/skin
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/skin/dragon_scales.bcm
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/stones
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/synthetic
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/textiles
- release/scripts/addons_contrib/online_mat_lib/material-library/bundled/cycles/wood
- release/scripts/addons_contrib/online_mat_lib/material-library/my-materials
- release/scripts/addons_contrib/online_mat_lib/material-library/peter.cassetta.info
- release/scripts/addons_contrib/online_mat_lib/material-library/peter.cassetta.info/release
- release/scripts/addons_contrib/online_mat_lib/material-library/peter.cassetta.info/release/cycles
- release/scripts/addons_contrib/online_mat_lib/material-library/peter.cassetta.info/testing
- release/scripts/addons_contrib/online_mat_lib/material-library/peter.cassetta.info/testing/cycles
- release/scripts/addons_contrib/oscurart_tools
- release/scripts/addons_contrib/presets
- release/scripts/addons_contrib/presets/interface_theme
- release/scripts/addons_contrib/presets/keyconfig
- release/scripts/addons_contrib/sequencer_extra_actions
- release/scripts/addons_contrib/sequencer_tools
- release/scripts/freestyle/modules
- release/scripts/freestyle/modules/freestyle
- release/scripts/freestyle/styles
- source/blender/imbuf/intern/oiio
- files removed:
- debian/patches/0011-fix_FTBFS_on_armel.patch
- extern/carve/include/carve/external
- extern/carve/include/carve/external/boost
- extern/libmv/patches
- extern/libmv/third_party/fast
- extern/libmv/third_party/ldl
- extern/libmv/third_party/ldl/Doc
- extern/libmv/third_party/ldl/Include
- extern/libmv/third_party/ldl/Source
- extern/libmv/third_party/ssba
- extern/libmv/third_party/ssba/Geometry
- extern/libmv/third_party/ssba/Math
- intern/bsp
- intern/bsp/extern
- intern/bsp/intern
- intern/ghost/test/gears/resources
- intern/ghost/test/gears/resources/osx
- intern/ghost/test/gears/resources/osx/English.lproj
- intern/ghost/test/gears/resources/osx/English.lproj/MainMenu.nib
- intern/tools
- release/datafiles/colormanagement/luts/camera_response
- release/datafiles/locale/ar
- release/datafiles/locale/ar/LC_MESSAGES
- release/datafiles/locale/ca
- release/datafiles/locale/ca/LC_MESSAGES
- release/datafiles/locale/cs
- release/datafiles/locale/cs/LC_MESSAGES
- release/datafiles/locale/de
- release/datafiles/locale/de/LC_MESSAGES
- release/datafiles/locale/eo
- release/datafiles/locale/eo/LC_MESSAGES
- release/datafiles/locale/es
- release/datafiles/locale/es/LC_MESSAGES
- release/datafiles/locale/es_ES
- release/datafiles/locale/es_ES/LC_MESSAGES
- release/datafiles/locale/fa
- release/datafiles/locale/fa/LC_MESSAGES
- release/datafiles/locale/fr
- release/datafiles/locale/fr/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/hr
- release/datafiles/locale/hr/LC_MESSAGES
- release/datafiles/locale/hu
- release/datafiles/locale/hu/LC_MESSAGES
- release/datafiles/locale/id
- release/datafiles/locale/id/LC_MESSAGES
- release/datafiles/locale/it
- release/datafiles/locale/it/LC_MESSAGES
- release/datafiles/locale/ja
- release/datafiles/locale/ja/LC_MESSAGES
- release/datafiles/locale/ko
- release/datafiles/locale/ko/LC_MESSAGES
- release/datafiles/locale/ky
- release/datafiles/locale/ky/LC_MESSAGES
- release/datafiles/locale/nl
- release/datafiles/locale/nl/LC_MESSAGES
- release/datafiles/locale/pt
- release/datafiles/locale/pt/LC_MESSAGES
- release/datafiles/locale/pt_BR
- release/datafiles/locale/pt_BR/LC_MESSAGES
- release/datafiles/locale/ru
- release/datafiles/locale/ru/LC_MESSAGES
- release/datafiles/locale/sr
- release/datafiles/locale/sr/LC_MESSAGES
- release/datafiles/locale/sr@latin
- release/datafiles/locale/sr@latin/LC_MESSAGES
- release/datafiles/locale/sv
- release/datafiles/locale/sv/LC_MESSAGES
- release/datafiles/locale/tr
- release/datafiles/locale/tr/LC_MESSAGES
- release/datafiles/locale/uk
- release/datafiles/locale/uk/LC_MESSAGES
- release/datafiles/locale/zh_CN
- release/datafiles/locale/zh_CN/LC_MESSAGES
- release/datafiles/locale/zh_TW
- release/datafiles/locale/zh_TW/LC_MESSAGES
- release/scripts/addons/compositing_film_response
- release/scripts/freestyle/data
- release/scripts/freestyle/data/env_map
- release/scripts/freestyle/data/textures
- release/scripts/freestyle/data/textures/brushes
- release/scripts/freestyle/data/textures/papers
- release/scripts/freestyle/data/textures/variation_patterns
- release/scripts/freestyle/style_modules
- source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_float
- source/tools
- source/tools/CTS
- source/tools/GL
- files renamed:
- debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch => debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch.THIS
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
release/datafiles/blender_icons.svg
release/datafiles/blender_icons16.png
release/datafiles/blender_icons32.png
release/datafiles/splash.png
release/datafiles/splash_2x.png
release/scripts/freestyle/data/env_map/brown00.png
release/scripts/freestyle/data/env_map/gray00.png
release/scripts/freestyle/data/env_map/gray01.png
release/scripts/freestyle/data/env_map/gray02.png
release/scripts/freestyle/data/env_map/gray03.png
release/scripts/freestyle/data/textures/brushes/charcoalAlpha.bmp
release/scripts/freestyle/data/textures/brushes/oil.bmp
release/scripts/freestyle/data/textures/brushes/oilnoblend.bmp
release/scripts/freestyle/data/textures/brushes/opaqueBrushAlpha.bmp
release/scripts/freestyle/data/textures/brushes/opaqueDryBrushAlpha.bmp
release/scripts/freestyle/data/textures/brushes/smoothAlpha.bmp
release/scripts/freestyle/data/textures/brushes/washbrushAlpha.bmp
release/scripts/freestyle/data/textures/papers/whitepaper.jpg
release/scripts/freestyle/data/textures/variation_patterns/dashed.bmp
release/scripts/freestyle/data/textures/variation_patterns/dashedfine.bmp
release/scripts/freestyle/data/textures/variation_patterns/pattern00.bmp
release/scripts/freestyle/data/textures/variation_patterns/pattern01.bmp
release/scripts/freestyle/data/textures/variation_patterns/pattern02.bmp
release/scripts/freestyle/data/textures/variation_patterns/pattern03.bmp
release/scripts/freestyle/data/textures/variation_patterns/pattern04.bmp
release/scripts/freestyle/data/textures/variation_patterns/pattern05.bmp
release/scripts/freestyle/data/textures/variation_patterns/pattern06.bmp
release/scripts/freestyle/data/textures/variation_patterns/pattern07.bmp
