Index: trunk/src/brave.c
===================================================================
--- trunk/src/brave.c	(revision 33985)
+++ trunk/src/brave.c	(revision 33986)
@@ -52,7 +52,6 @@
 
 static desc_t desc[] = {
 	{PCB_BRAVE_NOXOR, "noxor", "avoid xor drawing", "use alternative rendering instead of xor draw", 0},
-	{PCB_BRAVE_NOCLIPBATCH, "noclipbatch", "do not batch poly clipping", "skip optimization of batching polygon clipping in some expensive user operations", 0},
 	{PCB_BRAVE_NO_ENFORCE_CLR_MOVE, "enforceclrmove", "do not enforce object clearance on line point or line move", 0},
 	{0, NULL, NULL, NULL}
 };
Index: trunk/src/brave.h
===================================================================
--- trunk/src/brave.h	(revision 33985)
+++ trunk/src/brave.h	(revision 33986)
@@ -3,7 +3,6 @@
 typedef enum { /* bitfield */
 	PCB_BRAVE_OFF = 0,
 	PCB_BRAVE_NOXOR = 1,
-	PCB_BRAVE_NOCLIPBATCH = 2,
 	PCB_BRAVE_NO_ENFORCE_CLR_MOVE = 4,
 	PCB_BRAVE_max
 } pcb_brave_t;
Index: trunk/src/obj_subc.c
===================================================================
--- trunk/src/obj_subc.c	(revision 33985)
+++ trunk/src/obj_subc.c	(revision 33986)
@@ -1132,7 +1132,7 @@
 {
 	int n;
 
-	if (!(pcb_brave & PCB_BRAVE_NOCLIPBATCH) && (Data != NULL))
+	if (Data != NULL)
 		pcb_data_clip_inhibit_inc(Data);
 	pcb_subc_part_changed_inhibit_inc(sc);
 
@@ -1261,7 +1261,7 @@
 		case PCB_SUBCOP_UNDO_NORMAL: break;
 	}
 
-	if (!(pcb_brave & PCB_BRAVE_NOCLIPBATCH) && (Data != NULL))
+	if (Data != NULL)
 		pcb_data_clip_inhibit_dec(Data, 0);
 
 	return sc;
Index: trunk/src/operation.c
===================================================================
--- trunk/src/operation.c	(revision 33985)
+++ trunk/src/operation.c	(revision 33986)
@@ -135,7 +135,7 @@
 	int on_locked_too = (mode & PCB_OP_ON_LOCKED);
 	int no_subc_part = (mode & PCB_OP_NO_SUBC_PART);
 
-	if (!(pcb_brave & PCB_BRAVE_NOCLIPBATCH) && (data != NULL))
+	if (data != NULL)
 		pcb_data_clip_inhibit_inc(data);
 
 
@@ -392,7 +392,7 @@
 	if (Reset && changed)
 		pcb_undo_inc_serial();
 
-	if (!(pcb_brave & PCB_BRAVE_NOCLIPBATCH) && (data != NULL))
+	if (data != NULL)
 		pcb_data_clip_inhibit_dec(data, 0);
 
 	return changed;
Index: trunk/src/undo_old.c
===================================================================
--- trunk/src/undo_old.c	(revision 33985)
+++ trunk/src/undo_old.c	(revision 33986)
@@ -607,8 +607,7 @@
 	pcb_data_t *data = PCB->Data;
 	pcb_subc_t *subc = NULL;
 
-	if (!(pcb_brave & PCB_BRAVE_NOCLIPBATCH))
-		pcb_data_clip_inhibit_inc(PCB->Data);
+	pcb_data_clip_inhibit_inc(PCB->Data);
 
 	/* lookup entry by it's ID */
 	type = pcb_search_obj_by_id(pcb_removelist, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
@@ -625,15 +624,11 @@
 			pcb_extobj_float_geo(o);
 		}
 
-		if (!(pcb_brave & PCB_BRAVE_NOCLIPBATCH))
-			pcb_data_clip_inhibit_dec(PCB->Data, 1);
-
+		pcb_data_clip_inhibit_dec(PCB->Data, 1);
 		return rnd_true;
 	}
 
-	if (!(pcb_brave & PCB_BRAVE_NOCLIPBATCH))
-		pcb_data_clip_inhibit_dec(PCB->Data, 1);
-
+	pcb_data_clip_inhibit_dec(PCB->Data, 1);
 	return rnd_false;
 }