griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merging r50450 through r50454 from trunk into soc-2011-tomato

Browse Source
This commit is contained in:
Sergey Sharybin
2012-09-06 16:06:55 +00:00
parent 0b778a9026
commit 8cc17be274
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/bmesh/operators/bmo_subdivide.c
View File

@@ -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);

4
source/blender/editors/space_view3d/view3d_draw.c
View File

@@ -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);