From 8cc17be2746f74ea10a0bf9d3e7091ef6bb3c30c Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 6 Sep 2012 16:06:55 +0000 Subject: [PATCH] Merging r50450 through r50454 from trunk into soc-2011-tomato --- source/blender/bmesh/operators/bmo_subdivide.c | 2 +- source/blender/editors/space_view3d/view3d_draw.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index 23526d7498b..b239be1c83b 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -995,7 +995,7 @@ void bmo_subdivide_edges_exec(BMesh *bm, BMOperator *op) BMIter other_fiter; BM_ITER_ELEM (other_loop, &other_fiter, loops[a]->v, BM_LOOPS_OF_VERT) { if (other_loop->f != face) { - if (BM_vert_in_face(other_loop->f, loops[a]->v)) { + if (BM_vert_in_face(other_loop->f, loops[b]->v)) { /* we assume that these verts are not making an edge in the face */ BLI_assert(other_loop->prev->v != loops[a]->v); BLI_assert(other_loop->next->v != loops[a]->v); diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 97130390c14..85d8b386f52 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2836,8 +2836,8 @@ static int view3d_main_area_draw_engine(const bContext *C, ARegion *ar, int draw engine = RE_engine_create(type); - engine->tile_x = scene->r.xparts; - engine->tile_y = scene->r.yparts; + engine->tile_x = ceil(ar->winx/(float)scene->r.xparts); + engine->tile_y = ceil(ar->winy/(float)scene->r.yparts); type->view_update(engine, C);