Fix baking

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 24 insertions, 14 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/Manifest b/media-gfx/blender/Manifest
index 1da16891cd04..f1985c6cd524 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,25 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX blender-2.37-dirs.patch 727 RMD160 ddf5c951182f809374c43f1a1cce47f4397a868c SHA1 9b3cb06a8bd23b1a5041bd3193018c2e5e28dcfd SHA256 beb5e5835cde71a00712ddf600278ca0bbdb6020123faeb6ea7a53e8f6812e5e
 AUX blender-2.44-scriptsdir.patch 2586 RMD160 8e80859edf1fae2f401b326be4cb939108879999 SHA1 50143946828d3f2b2568e71fae5ed28f6adf7449 SHA256 a7afac10ce2431cd94d10dc3f4cae33423b5a59d0c6918199006f623cd6d68e4
 AUX blender-2.46-cve-2008-1103-1.patch 636 RMD160 11d0b7dbff6e186334a80b7f6932ace4a1bd6628 SHA1 979fa1c2f0836b46dfd26c197798625a72e0a28b SHA256 a0dd64fb749a9577d84e22896872dc2956a8530700308d0aadad588191356b96
 AUX blender-2.46-ffmpeg.patch 3823 RMD160 33f41651b1a6bc6d497ba01ab710ca3d7a1559c0 SHA1 82ce585db15a3c88625b0c04e649bd08b3c35b41 SHA256 ad75babcc08ae41f2a7c71bc457bd56a0ef39b5ae1e92ede2cdb0a34d7cbcc85
 AUX blender-2.48-ffmpeg-20081014.patch 839 RMD160 b1fbad04a890dcc1698d02f5351d6d79cae42d91 SHA1 e931f1a85c5c01918b960936d4da5888eacfd64c SHA256 d6114d2647758e39608fcfdb05da00811f062ea3fc4c41cef3a6e2977bc5b0c4
 AUX blender-2.48a-CVE-2008-4863.patch 696 RMD160 b61dc085d0154be3850fa4b53985f670cd177adf SHA1 805f18290965c2e74778628c4e2a1888ea77d8ab SHA256 fee1896c791a623181ebf681f4ad67c610677e82575a95a46e896b747f980418
+AUX blender-2.49a-bake.patch 669 RMD160 19e167e2d3c8fcd573f9755dee8c6cb59984829e SHA1 5ae418e697c90418cf65652134b08ba6da3f93c1 SHA256 dcaaaba19ad57b6d054df830dfa303c4656303622e1e7ef15817d304958d8f3c
 AUX blender-2.49a-sys-openjpeg.patch 452 RMD160 7029b3d257839d4ca8ce58a9f8e46503651b1765 SHA1 85551623c4293d9dff4dc8d26584a753b3ccd581 SHA256 437f016b9f7c48281015838a22203c4db9ef6b62dac01aa86faa1c9793bff182
 AUX blender.desktop 194 RMD160 5b154d86d52f46a3f1fcd29da90322e1727f1107 SHA1 a1b70789388f72f2a292939588365a0b845b83b7 SHA256 9d21fe8823f249f0720895107817854dd8ce64afe6586317af08805b94fe0fab
 AUX blender.png 2119 RMD160 e06574002001f41198dc9408ef1bba45493fcc27 SHA1 9a0d713235ce99f8e4fde4f062209ab989e48c0f SHA256 bef633319c81323bb82db274004d89082ca05cab6650eb4c4bf43f830ccb5cad
 DIST blender-2.48a.tar.gz 21502247 RMD160 5ef94d6019302bfea86d5657af738d1d86a8bcd5 SHA1 9fb2dbf5d6cfcba8ae2d6d9b93ca9e3e66aae6c7 SHA256 781d4d9e2332f4f3887af1d66fb70c4c6dd0b89166391403ee4853108abf4e46
 DIST blender-2.49a.tar.gz 23039535 RMD160 f37100c7a02c75b622b8e055f32f06e064a62de2 SHA1 59f5be96eda874bb901390f55a70d58cf8e0b979 SHA256 b206b878a6f96d1e8561ee62a58fba1af4141579c27f51ec795f08f4129eb1fc
 EBUILD blender-2.48a-r3.ebuild 4133 RMD160 9fe866fe26404ff233526ce0bb3c25ed38e0c777 SHA1 27cc6ff87860fc3623a4a9fd4db288435d6da4c7 SHA256 5f1f4112dc9edc04ed77b97d5daa5d27a1be96e8d4c995209909f06790aadea3
-EBUILD blender-2.49a.ebuild 4852 RMD160 db020a67e935729f2fc180807d4f059be9552036 SHA1 fcea1bc4b32d3a052e584ecc8469569ec1f64e66 SHA256 de1acd71defbd2b54d1a7140afa9a8961dad35b230eb7e5e8834344d53dfb0aa
-MISC ChangeLog 26365 RMD160 87ee73e6ac186662b794cbd0f679eac0309c82e6 SHA1 24113319dba808ed26f7bf8264a5d49e022bf056 SHA256 d56f2805453c86abed7384a909497dd9d7b2838888930afa8385b202969b88e3
+EBUILD blender-2.49a.ebuild 4898 RMD160 97d944e4420b09a971f488f85a9884d94a31e4c0 SHA1 40143dbd2f2269a2d2dc7528a84737ad9c24f077 SHA256 c04b8f7626a15e693b732a7b075d2bbc07954ea034e46fea3fb11e38992f5dc6
+MISC ChangeLog 26553 RMD160 49185c8a1c1555066f5fbc5466a1a5d5845bccb4 SHA1 db48bce9d19186e8dd5d46578c2e6c6f59a1fda9 SHA256 466791e4ac86b8543ef8f1c32a05dcd710bd1878ae71c950bed90bbfb8683b33
 MISC metadata.xml 719 RMD160 132dfe4fc49228b922ed39f556c403347e992ef9 SHA1 7896fb17bd0dd87d8a072b0f6f6072876c1eed94 SHA256 6409856f1883ed49aae365c885d5512a38784a5a48a2bbf7dd583b8054d32510
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
-
-iEYEARECAAYFAkpPsTIACgkQkKaRLQcq0GIUgQCggffANJcoVS0xoOEfbd+ON6fy
-yg4An2NyGxSevEig06u0/6kEKjtY8Pod
-=QY40
------END PGP SIGNATURE-----
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)