archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for mistake in last commit, using wrong flag.

Browse Source
This commit is contained in:
Brecht Van Lommel
2008-02-22 15:09:24 +00:00
parent 0e935e397b
commit ed385dd5ce
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/render/intern/source/convertblender.c
View File

@@ -4207,7 +4207,7 @@ static void add_render_object(Render *re, Object *ob, Object *par, DupliObject *
/* 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 @@ static void add_render_object(Render *re, Object *ob, Object *par, DupliObject *
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);
}