Index: trunk/src/obj_common.c
===================================================================
--- trunk/src/obj_common.c	(revision 18408)
+++ trunk/src/obj_common.c	(revision 18409)
@@ -66,7 +66,7 @@
 /* returns a pointer to an objects bounding box;
  * data is valid until the routine is called again
  */
-int pcb_obj_get_bbox(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_box_t *res)
+int pcb_obj_get_bbox_naked(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_box_t *res)
 {
 	switch (Type) {
 	case PCB_OBJ_LINE:
@@ -74,10 +74,10 @@
 	case PCB_OBJ_TEXT:
 	case PCB_OBJ_POLY:
 	case PCB_OBJ_PSTK:
-		*res = *(pcb_box_t *)Ptr2;
+		*res = ((pcb_any_obj_t *)Ptr2)->bbox_naked;
 		return 0;
 	case PCB_OBJ_SUBC:
-		*res = *(pcb_box_t *)Ptr1;
+		*res = ((pcb_any_obj_t *)Ptr1)->bbox_naked;
 		return 0;
 	case PCB_OBJ_POLY_POINT:
 	case PCB_OBJ_LINE_POINT:
Index: trunk/src/obj_common.h
===================================================================
--- trunk/src/obj_common.h	(revision 18408)
+++ trunk/src/obj_common.h	(revision 18409)
@@ -99,7 +99,7 @@
 pcb_flag_values_t pcb_obj_valid_flags(unsigned long int objtype);
 
 
-int pcb_obj_get_bbox(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_box_t *res);
+int pcb_obj_get_bbox_naked(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_box_t *res);
 
 /* Host transformations: typically the transformations an object of a subc
    inherits from the subc */
Index: trunk/src/tool.c
===================================================================
--- trunk/src/tool.c	(revision 18408)
+++ trunk/src/tool.c	(revision 18409)
@@ -297,7 +297,7 @@
 	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_SECOND;
 
 	/* get boundingbox of object and set cursor range */
-	pcb_obj_get_bbox(pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3, &box);
+	pcb_obj_get_bbox_naked(pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3, &box);
 	pcb_crosshair_set_range(pcb_crosshair.AttachedObject.X - box.X1,
 										pcb_crosshair.AttachedObject.Y - box.Y1,
 										PCB->MaxWidth - (box.X2 - pcb_crosshair.AttachedObject.X),