[Bf-blender-cvs] [eab0063] master: Fix mixup w/ wmOperator/BMOperator flag

Campbell Barton noreply at git.blender.org
Wed Nov 18 01:17:07 CET 2015


Commit: eab00634812baf38b5b6535d72284236785dccd5
Author: Campbell Barton
Date:   Wed Nov 18 11:09:44 2015 +1100
Branches: master
https://developer.blender.org/rBeab00634812baf38b5b6535d72284236785dccd5

Fix mixup w/ wmOperator/BMOperator flag

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

M	source/blender/editors/mesh/editmesh_bisect.c
M	source/blender/editors/mesh/editmesh_tools.c

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

diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c
index 08d0697..0e1ba2b 100644
--- a/source/blender/editors/mesh/editmesh_bisect.c
+++ b/source/blender/editors/mesh/editmesh_bisect.c
@@ -285,13 +285,13 @@ static int mesh_bisect_exec(bContext *C, wmOperator *op)
 
 		/* Fill */
 		BMO_op_initf(
-		        bm, &bmop_fill, op->flag,
+		        bm, &bmop_fill, 0,
 		        "triangle_fill edges=%S normal=%v use_dissolve=%b",
 		        &bmop, "geom_cut.out", normal_fill, true);
 		BMO_op_exec(bm, &bmop_fill);
 
 		/* Copy Attributes */
-		BMO_op_initf(bm, &bmop_attr, op->flag,
+		BMO_op_initf(bm, &bmop_attr, 0,
 		             "face_attribute_fill faces=%S use_normals=%b use_data=%b",
 		             &bmop_fill, "geom.out", false, true);
 		BMO_op_exec(bm, &bmop_attr);
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 67c23a9..2d9de6d 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -5127,7 +5127,7 @@ static int edbm_bridge_edge_loops_exec(bContext *C, wmOperator *op)
 				EDBM_mesh_normals_update(em);
 
 				BMO_op_initf(
-				        em->bm, &bmop_subd, op->flag,
+				        em->bm, &bmop_subd, 0,
 				        "subdivide_edgering edges=%S interp_mode=%i cuts=%i smooth=%f "
 				        "profile_shape=%i profile_shape_factor=%f",
 				        &bmop, "edges.out", op_props.interp_mode, op_props.cuts, op_props.smooth,




More information about the Bf-blender-cvs mailing list