diff options
author | Johnny Matthews <johnny.matthews@gmail.com> | 2004-03-05 23:08:30 +0300 |
---|---|---|
committer | Johnny Matthews <johnny.matthews@gmail.com> | 2004-03-05 23:08:30 +0300 |
commit | b5fef06a953b468fc171f7a93168eed9da92dee8 (patch) | |
tree | 64167e91cc231efd5f5330afe8a7a547e9dd089d /source | |
parent | 445fd66f27f898fbc8171ca559b7ab4aae5f451f (diff) |
Bugfixes by eeshlo
Fixes Bug 990 and 976
990 - Parenting Issues with Yafray Export
976 - Curve (Text) 'Front' and 'Back' not Exporting to Yafray
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/renderconverter/intern/convertBlenderScene.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c index c1eb91cce76..088692044d2 100644 --- a/source/blender/renderconverter/intern/convertBlenderScene.c +++ b/source/blender/renderconverter/intern/convertBlenderScene.c @@ -2528,6 +2528,7 @@ static void init_render_curve(Object *ob) for(a=0; a<dl->parts; a++, index+=3) { vlr= RE_findOrAddVlak(R.totvlak++); + vlr->ob = ob; /* yafray: correction for curve rendering, obptr was not set */ vlr->v1= RE_findOrAddVert(startvert+index[0]); vlr->v2= RE_findOrAddVert(startvert+index[1]); vlr->v3= RE_findOrAddVert(startvert+index[2]); @@ -2953,11 +2954,18 @@ void RE_rotateBlenderScene(void) free_duplilist(); } else { - /* yafray: if there are linked data objects (except lamps), + /* yafray: if there are linked data objects (except lamps or empties), 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) { - if ((ob->type!=OB_LAMP) && (YAF_objectKnownData(ob))) + /* Special case, parent object dupli's: ignore lattices */ + if (ob->parent) { + if ((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))) printf("Added dupli matrix for linked data object %s\n", ob->id.name); else init_render_object(ob); |