diff options
| author | Alfredo de Greef <eeshlo@yahoo.com> | 2005-05-10 06:00:13 +0400 |
|---|---|---|
| committer | Alfredo de Greef <eeshlo@yahoo.com> | 2005-05-10 06:00:13 +0400 |
| commit | 0c3f0556770ba1ef599400546beec62577904b35 (patch) | |
| tree | 4d7182f0c837e8347c6d3113f6fbf93109169049 /source/blender/renderconverter | |
| parent | 3676fb1b3fa6362d1c713b5d50c429828e921223 (diff) | |
Forgot part of the vertexcolor endian fix in xml export code.
Fixed an as of yet unreported bug, linked data objects which have materials
linked to object instead of data have to be exported as normal, they cannot
be instanciated, otherwise they will all share the same material.
Diffstat (limited to 'source/blender/renderconverter')
| -rw-r--r-- | source/blender/renderconverter/intern/convertBlenderScene.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c index 1cd0450bb7d..1c3106cd7b1 100644 --- a/source/blender/renderconverter/intern/convertBlenderScene.c +++ b/source/blender/renderconverter/intern/convertBlenderScene.c @@ -3125,8 +3125,10 @@ void RE_rotateBlenderScene(void) else { /* yafray: if there are linked data objects (except lamps, empties or armatures), 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) { + The dupliMtx list is used for this purpose. + Exception: objects which have object linked materials, these cannot be instanciated. */ + if ((R.r.renderer==R_YAFRAY) && (ob->colbits==0)) + { /* Special case, parent object dupli's: ignore if object itself is lamp or parent is lattice or empty */ if (ob->parent) { if ((ob->type!=OB_LAMP) && (ob->parent->type!=OB_EMPTY) && |