diff options
author | Alfredo de Greef <eeshlo@yahoo.com> | 2004-08-12 03:32:13 +0400 |
---|---|---|
committer | Alfredo de Greef <eeshlo@yahoo.com> | 2004-08-12 03:32:13 +0400 |
commit | 012854ae9323aadc4b0345c9ebd3260a636dd85b (patch) | |
tree | 8f16ad563f0427b9b4f23e9d7a249bccf90e031a /source/blender/renderconverter | |
parent | 9bbc1e9c0aa5107f9782ab9949ebf285fb1dbea8 (diff) |
Fixed bug discovered by dotblend, parented empty's were mistakenly
included in the duplicate objects list.
Added support for spherelight 'dummy' mode when used with global photonmap.
It now behaves the same as arealight when used with gpm.
Diffstat (limited to 'source/blender/renderconverter')
-rw-r--r-- | source/blender/renderconverter/intern/convertBlenderScene.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c index 01a0f24dde2..ac988e850e5 100644 --- a/source/blender/renderconverter/intern/convertBlenderScene.c +++ b/source/blender/renderconverter/intern/convertBlenderScene.c @@ -2966,14 +2966,14 @@ void RE_rotateBlenderScene(void) yafray only needs to know about one, the rest can be instanciated. The dupliMtx list is used for this purpose */ if (R.r.renderer==R_YAFRAY) { - /* Special case, parent object dupli's: ignore lattices */ + /* Special case, parent object dupli's: ignore lattices & empty's */ if (ob->parent) { - if ((ob->parent->type!=OB_LATTICE) && (YAF_objectKnownData(ob))) + if ((ob->parent->type!=OB_EMPTY) && (ob->parent->type!=OB_LATTICE) && YAF_objectKnownData(ob)) printf("From parent: Added dupli matrix for linked data object %s\n", ob->id.name); else init_render_object(ob); } - else if ((ob->type!=OB_EMPTY) && (ob->type!=OB_LAMP) && (YAF_objectKnownData(ob))) + else if ((ob->type!=OB_EMPTY) && (ob->type!=OB_LAMP) && YAF_objectKnownData(ob)) printf("Added dupli matrix for linked data object %s\n", ob->id.name); else init_render_object(ob); |