diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-03-30 11:22:12 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-03-30 11:24:26 +0300 |
commit | 1b327aa2195ff4c4d3f87b303a767cfaea648047 (patch) | |
tree | 3474d8b5bd3ad074a76a0f3202a44bb524eb55e8 /source/blender/blenkernel/intern/displist.c | |
parent | 59740a6c985efbf5369d27a5919e184036d0287a (diff) |
Fix T44186: Bezier Bevel facto mapping broken when 'start' was set to 'Resolution' and 'end' was not.
Trivial, we need totla_length in that case too.
Safe to be backported to 2.74.
Diffstat (limited to 'source/blender/blenkernel/intern/displist.c')
-rw-r--r-- | source/blender/blenkernel/intern/displist.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index e5e751561ec..9004b5528ca 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -1435,9 +1435,8 @@ static void calc_bevfac_mapping(Curve *cu, BevList *bl, Nurb *nu, return; } - if (ELEM(cu->bevfac1_mapping, - CU_BEVFAC_MAP_SEGMENT, - CU_BEVFAC_MAP_SPLINE)) + if (ELEM(cu->bevfac1_mapping, CU_BEVFAC_MAP_SEGMENT, CU_BEVFAC_MAP_SPLINE) || + ELEM(cu->bevfac2_mapping, CU_BEVFAC_MAP_SEGMENT, CU_BEVFAC_MAP_SPLINE)) { for (i = 0; i < SEGMENTSU(nu); i++) { total_length += bl->seglen[i]; |