From 9982b283e6f794057d37f9abcda12013b773dcdc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 27 Nov 2012 02:34:40 +0000 Subject: fix for asserts added in own recent commit with more strict type-checking - BMO_slot_copy now only copies compatible elements. other minor changes - don't use text.format(...), convention for UI scripts is C style string formatting. - rename bmo_edgenet_prepare --> bmo_edgenet_prepare_exec - float/double warning in bevel. --- source/blender/bmesh/intern/bmesh_operator_api.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/bmesh/intern/bmesh_operator_api.h') diff --git a/source/blender/bmesh/intern/bmesh_operator_api.h b/source/blender/bmesh/intern/bmesh_operator_api.h index 245a53ebed2..1bb83a12e48 100644 --- a/source/blender/bmesh/intern/bmesh_operator_api.h +++ b/source/blender/bmesh/intern/bmesh_operator_api.h @@ -136,8 +136,8 @@ typedef enum eBMOpSlotSubType_Ptr { } eBMOpSlotSubType_Ptr; typedef union eBMOpSlotSubType_Union { - eBMOpSlotSubType_Map elem; - eBMOpSlotSubType_Map ptr; + eBMOpSlotSubType_Elem elem; + eBMOpSlotSubType_Ptr ptr; eBMOpSlotSubType_Map map; } eBMOpSlotSubType_Union; -- cgit v1.2.3