[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40554] trunk/blender/source/blender/ render/intern/source/convertblender.c: bugfix [#28744] Object mapped textures (decals) in linked files are not rendered properly
Campbell Barton
ideasman42 at gmail.com
Mon Sep 26 09:39:29 CEST 2011
Revision: 40554
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40554
Author: campbellbarton
Date: 2011-09-26 07:39:29 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
bugfix [#28744] Object mapped textures (decals) in linked files are not rendered properly
Modified Paths:
--------------
trunk/blender/source/blender/render/intern/source/convertblender.c
Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c 2011-09-26 07:01:02 UTC (rev 40553)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c 2011-09-26 07:39:29 UTC (rev 40554)
@@ -4852,8 +4852,13 @@
* NULL is just for init */
set_dupli_tex_mat(NULL, NULL, NULL);
- for(SETLOOPER(re->scene, sce_iter, base)) {
- ob= base->object;
+ /* loop over all objects rather then using SETLOOPER because we may
+ * reference an mtex-mapped object which isnt rendered or is an
+ * empty in a dupli group. We could scan all render material/lamp/world
+ * mtex's for mapto objects but its easier just to set the
+ * 'imat' / 'imat_ren' on all and unlikely to be a performance hit
+ * See bug: [#28744] - campbell */
+ for(ob= re->main->object.first; ob; ob= ob->id.next) {
/* imat objects has to be done here, since displace can have texture using Object map-input */
mul_m4_m4m4(mat, ob->obmat, re->viewmat);
invert_m4_m4(ob->imat_ren, mat);
More information about the Bf-blender-cvs
mailing list