[Bf-blender-cvs] [192df29] master: Fix T48926: Subdivide edge-ring crash

[Campbell Barton]

Commit: 192df299d946c5c4748490153c018661f2d9a5ee
Author: Campbell Barton
Date:   Fri Jul 22 15:41:56 2016 +1000
Branches: master
https://developer.blender.org/rB192df299d946c5c4748490153c018661f2d9a5ee

Fix T48926: Subdivide edge-ring crash

Also resolves: T34294

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

M	source/blender/bmesh/operators/bmo_subdivide_edgering.c

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

diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.c b/source/blender/bmesh/operators/bmo_subdivide_edgering.c
index b4a77bf..ce031e1 100644
--- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c
+++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c
@@ -1099,7 +1099,8 @@ void bmo_subdivide_edgering_exec(BMesh *bm, BMOperator *op)
 		BMFace *f;
 
 		BM_ITER_ELEM (f, &fiter, e, BM_FACES_OF_EDGE) {
-			if (!BMO_face_flag_test(bm, f, FACE_OUT)) {
+			/* could support ngons, other areas would need updating too, see T48926. */
+			if ((f->len <= 4) && !BMO_face_flag_test(bm, f, FACE_OUT)) {
 				BMIter liter;
 				BMLoop *l;
 				bool ok = false;