diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-07-15 15:11:36 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-07-15 15:11:36 +0400 |
| commit | abe84a4f43939fd14a4830d958890e870ddeb180 (patch) | |
| tree | 988364c89a12979a57f1f569074c18530d449b29 /source/blender/blenkernel/intern/mesh.c | |
| parent | 61cb92f701deb6af31476f3687207be5d63b1ce2 (diff) | |
Fix #36139: cycles not taking texture spacing settings into account for
generated coordinates on text objects.
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index f3aefbe03e0..1b5b7101c71 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -702,6 +702,19 @@ void BKE_mesh_texspace_get(Mesh *me, float r_loc[3], float r_rot[3], float r_siz if (r_size) copy_v3_v3(r_size, me->size); } +void BKE_mesh_texspace_copy_from_object(Mesh *me, Object *ob) +{ + float *texloc, *texrot, *texsize; + short *texflag; + + if (BKE_object_obdata_texspace_get(ob, &texflag, &texloc, &texsize, &texrot)) { + me->texflag = *texflag; + copy_v3_v3(me->loc, texloc); + copy_v3_v3(me->size, texsize); + copy_v3_v3(me->rot, texrot); + } +} + float (*BKE_mesh_orco_verts_get(Object *ob))[3] { Mesh *me = ob->data; |