diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2009-07-24 13:21:48 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2009-07-24 13:21:48 +0000 |
| commit | eb34215e4df47e4b7e3c26be8b202703c5a4adfc (patch) | |
| tree | 4dcd1900d402ca297c13c5869e034430a67697da /media-gfx | |
| parent | amd64 stable, bug #278679 (diff) | |
| download | gentoo-2-eb34215e4df47e4b7e3c26be8b202703c5a4adfc.tar.gz gentoo-2-eb34215e4df47e4b7e3c26be8b202703c5a4adfc.tar.bz2 gentoo-2-eb34215e4df47e4b7e3c26be8b202703c5a4adfc.zip | |
Fix baking
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/blender/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/blender/blender-2.49a.ebuild | 3 | ||||
| -rw-r--r-- | media-gfx/blender/files/blender-2.49a-bake.patch | 13 |
3 files changed, 21 insertions, 2 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index c77701507728..4946ede2ba72 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/blender # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.177 2009/07/04 19:43:17 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.178 2009/07/24 13:21:48 lu_zero Exp $ + + 24 Jul 2009; Luca Barbato <lu_zero@gentoo.org> + +files/blender-2.49a-bake.patch, blender-2.49a.ebuild: + Fix baking as reported in bug #278768, thanks to the reporter for the + patch 04 Jul 2009; Markus Meier <maekke@gentoo.org> blender-2.49a.ebuild: tweak ffmpeg dep once again diff --git a/media-gfx/blender/blender-2.49a.ebuild b/media-gfx/blender/blender-2.49a.ebuild index 636f97c4c0af..232aa63bab1f 100644 --- a/media-gfx/blender/blender-2.49a.ebuild +++ b/media-gfx/blender/blender-2.49a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.5 2009/07/04 19:43:17 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.6 2009/07/24 13:21:48 lu_zero Exp $ EAPI=2 @@ -57,6 +57,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.37-dirs.patch epatch "${FILESDIR}"/${PN}-2.44-scriptsdir.patch epatch "${FILESDIR}"/${PN}-2.49a-sys-openjpeg.patch + epatch "${FILESDIR}"/${PN}-2.49a-bake.patch rm -f "${S}/release/scripts/bpymodules/"*.pyc } diff --git a/media-gfx/blender/files/blender-2.49a-bake.patch b/media-gfx/blender/files/blender-2.49a-bake.patch new file mode 100644 index 000000000000..53674da3f4a2 --- /dev/null +++ b/media-gfx/blender/files/blender-2.49a-bake.patch @@ -0,0 +1,13 @@ +Index: source/blender/render/intern/source/rendercore.c +=================================================================== +--- source/blender/render/intern/source/rendercore.c (revision 21781) ++++ source/blender/render/intern/source/rendercore.c (working copy) +@@ -2241,7 +2241,7 @@ + /* no direction checking for now, doesn't always improve the result + * (INPR(shi->facenor, bs->dir) > 0.0f); */ + +- return (R.objectinstance[ob].obr->ob != bs->actob); ++ return (R.objectinstance[ob & ~RE_RAY_TRANSFORM_OFFS].obr->ob != bs->actob); + } + + static int bake_intersect_tree(RayTree* raytree, Isect* isect, float *start, float *dir, float sign, float *hitco, float *dist) |