diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-11-27 06:34:40 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-27 06:34:40 +0400 |
commit | 9982b283e6f794057d37f9abcda12013b773dcdc (patch) | |
tree | 61e6d7c0d9c384b5c65aef7ebe579c2a4b728d6c /source/blender/bmesh/intern/bmesh_operator_api.h | |
parent | 33c92a02e41636302a803cd08d9534b9e8da439c (diff) |
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.
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_operator_api.h')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_operator_api.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; |