« back to all changes in this revision
Viewing changes to source/blender/freestyle/intern/scene_graph/FrsMaterial.h
- Committer: Package Import Robot
- Date: 2014-02-19 11:24:23 UTC
- mfrom: (14.2.23 sid)
- Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
* Merge with Debian; remaining changes:
- Configure without OpenImageIO on armhf, as it is not available on
Ubuntu.
- Configure without OpenImageIO on armhf, as it is not available on
Ubuntu.
- files added:
- .pc/0011-fix_FTBFS_on_armel.patch
- .pc/0011-fix_FTBFS_on_armel.patch/intern
- .pc/0011-fix_FTBFS_on_armel.patch/intern/atomic
- intern/atomic
- release/datafiles/colormanagement/luts/camera_response
- release/datafiles/colormanagement/luts/film_response
- release/scripts/presets/cycles/sampling
- files removed:
- .pc/0011-fix_PATH_MAX_issue.patch
- .pc/0011-fix_PATH_MAX_issue.patch/intern
- .pc/0011-fix_PATH_MAX_issue.patch/intern/ghost
- .pc/0011-fix_PATH_MAX_issue.patch/intern/ghost/intern
- .pc/0011-fix_PATH_MAX_issue.patch/source
- .pc/0011-fix_PATH_MAX_issue.patch/source/blender
- .pc/0011-fix_PATH_MAX_issue.patch/source/blender/blenlib
- .pc/0011-fix_PATH_MAX_issue.patch/source/blender/blenlib/intern
- source/gameengine/GamePlayer/xembed
- source/gameengine/GamePlayer/xembed/apparmor
- files modified:
- .pc/0001-blender_thumbnailer.patch/source/creator/CMakeLists.txt
added
removed
source/blender/freestyle/intern/scene_graph/FrsMaterial.h
