[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13817] trunk/blender/source/blender/ render/intern/source/convertblender.c:

Brecht Van Lommel brechtvanlommel at pandora.be
Fri Feb 22 16:09:25 CET 2008


Revision: 13817
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13817
Author:   blendix
Date:     2008-02-22 16:09:24 +0100 (Fri, 22 Feb 2008)

Log Message:
-----------

Fix for mistake in last commit, using wrong flag.

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	2008-02-22 14:27:46 UTC (rev 13816)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2008-02-22 15:09:24 UTC (rev 13817)
@@ -4207,7 +4207,7 @@
 	/* one render object for the data itself */
 	if(allow_render) {
 		obr= RE_addRenderObject(re, ob, par, index, 0, ob->lay);
-		if((dob && !dob->animated) || (ob->flag & OB_RENDER_DUPLI)) {
+		if((dob && !dob->animated) || (ob->transflag & OB_RENDER_DUPLI)) {
 			obr->flag |= R_INSTANCEABLE;
 			Mat4CpyMat4(obr->obmat, ob->obmat);
 		}
@@ -4229,7 +4229,7 @@
 		psysindex= 1;
 		for(psys=ob->particlesystem.first; psys; psys=psys->next, psysindex++) {
 			obr= RE_addRenderObject(re, ob, par, index, psysindex, ob->lay);
-			if((dob && !dob->animated) || (ob->flag & OB_RENDER_DUPLI)) {
+			if((dob && !dob->animated) || (ob->transflag & OB_RENDER_DUPLI)) {
 				obr->flag |= R_INSTANCEABLE;
 				Mat4CpyMat4(obr->obmat, ob->obmat);
 			}





More information about the Bf-blender-cvs mailing list