[Bf-blender-cvs] [5ed449d] master: Fix mistake in recent patch

Campbell Barton noreply at git.blender.org
Sat May 17 06:36:28 CEST 2014


Commit: 5ed449dabb1e668ce1f155db4f52b71a26ed0379
Author: Campbell Barton
Date:   Sat May 17 14:36:05 2014 +1000
https://developer.blender.org/rB5ed449dabb1e668ce1f155db4f52b71a26ed0379

Fix mistake in recent patch

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

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

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

diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index e5d7f03..b50a44b 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -1380,7 +1380,7 @@ static void calc_bevfac_spline_mapping(BevList *bl, float bevfac, float spline_l
 static void calc_bevfac_mapping(Curve *cu, BevList *bl, short splinetype, const bool use_render_resolution,
                                 int *r_start, float *r_firstblend, int *r_steps, float *r_lastblend)
 {
-	const int resolu = (use_render_resolution) ? cu->resolu_ren : cu->resolu;
+	const int resolu = (use_render_resolution && (cu->resolu_ren != 0)) ? cu->resolu_ren : cu->resolu;
 	const int segcount = (splinetype == CU_POLY) ? bl->nr : (bl->nr / resolu);
 
 	BevPoint *bevp, *bevl;




More information about the Bf-blender-cvs mailing list