Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-01-05 19:05:14 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-01-05 19:05:14 +0400
commit7f0239033b3b2d632da0654c1727ac5fc13d9ce6 (patch)
treed6403d7be2800b131b4add3c822dc2a4688b5570 /source/blender/blenkernel
parent5ff0d465ee219e43d4125b2d443dd19d4baad867 (diff)
Text3d: font family dupli-objects now follow rotation of the curve path
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/anim.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index e108df058ce..b8a6262463c 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -1668,6 +1668,16 @@ static void font_duplilist(ListBase *lb, Scene *scene, Object *par, int persiste
mul_m4_v3(pmat, vec);
copy_m4_m4(obmat, par->obmat);
+
+ if (UNLIKELY(ct->rot != 0.0f)) {
+ float rmat[4][4];
+
+ zero_v3(obmat[3]);
+ unit_m4(rmat);
+ rotate_m4(rmat, 'Z', -ct->rot);
+ mul_m4_m4m4(obmat, obmat, rmat);
+ }
+
copy_v3_v3(obmat[3], vec);
new_dupli_object(lb, ob, obmat, par->lay, persistent_id, level, a, OB_DUPLIVERTS, flag);