[Bf-blender-cvs] [e6b81ae] blender-v2.74-release: Fix T44186: Bezier Bevel facto mapping broken when 'start' was set to 'Resolution' and 'end' was not.

[Bastien Montagne]

Commit: e6b81ae69a8b811dedf3df0b743c443bb5f5592a
Author: Bastien Montagne
Date:   Mon Mar 30 10:22:12 2015 +0200
Branches: blender-v2.74-release
https://developer.blender.org/rBe6b81ae69a8b811dedf3df0b743c443bb5f5592a

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.

===================================================================

M	source/blender/blenkernel/intern/displist.c

===================================================================

diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index dd92a82..ff777b4 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -1434,9 +1434,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];