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-05-17 08:36:05 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-05-17 08:36:05 +0400
commit5ed449dabb1e668ce1f155db4f52b71a26ed0379 (patch)
tree058b354cd4c275b6f9297a3007907155f7baa65e /source/blender/blenkernel/intern/displist.c
parent92a380d0b280c5851a37d076dba463358461974d (diff)
Fix mistake in recent patch
Diffstat (limited to 'source/blender/blenkernel/intern/displist.c')
-rw-r--r--source/blender/blenkernel/intern/displist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index e5d7f03aae3..b50a44b92c2 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;