diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2015-10-22 20:16:14 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2015-10-22 20:16:14 +0300 |
commit | 83a2d3dcf5a73f907c741038d5c55cb9f7aff1f9 (patch) | |
tree | 46e8c12b29369072f487de5920f33a3e7148176e /source/blender/blenkernel/intern/displist.c | |
parent | 9f8eb0e1eb220015f0cff530bcb0491828f05c99 (diff) | |
parent | 6bc007610263c879f6bb30b844ba9d9a0fb9433c (diff) |
Merge branch 'master' into UI-experiments
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/customdata.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/resources.c
source/blender/editors/transform/transform_manipulator.c
source/blender/windowmanager/intern/wm_init_exit.c
Diffstat (limited to 'source/blender/blenkernel/intern/displist.c')
-rw-r--r-- | source/blender/blenkernel/intern/displist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 3213b59b92d..a2d555d0918 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -1521,7 +1521,7 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba BKE_curve_bevelList_free(&ob->curve_cache->bev); - /* We only re-evlauate path if evaluation is not happening for orco. + /* We only re-evaluate path if evaluation is not happening for orco. * If the calculation happens for orco, we should never free data which * was needed before and only not needed for orco calculation. */ @@ -1600,7 +1600,7 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba float bottom_no[3] = {0.0f}; float top_no[3] = {0.0f}; float firstblend = 0.0f, lastblend = 0.0f; - int i, start, steps; + int i, start, steps = 0; if (nu->flagu & CU_NURB_CYCLIC) { calc_bevfac_mapping_default(bl, |