[Bf-blender-cvs] [1b327aa] master: Fix T44186: Bezier Bevel facto mapping broken when 'start' was set to 'Resolution' and 'end' was not.
Bastien Montagne
noreply at git.blender.org
Mon Mar 30 10:24:59 CEST 2015
Commit: 1b327aa2195ff4c4d3f87b303a767cfaea648047
Author: Bastien Montagne
Date: Mon Mar 30 10:22:12 2015 +0200
Branches: master
https://developer.blender.org/rB1b327aa2195ff4c4d3f87b303a767cfaea648047
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 e5e7515..9004b55 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];
More information about the Bf-blender-cvs
mailing list