← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/bmesh/intern/bmesh_operator_api_inline.h

  • Committer: Reinhard Tartler
  • Date: 2014-05-31 01:50:05 UTC
  • mfrom: (14.2.27 sid)
  • Revision ID: siretart@tauware.de-20140531015005-ml6druahuj82nsav
merge from debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/bmesh/intern/bmesh_operator_api_inline.h
78
78
}
79
79
 
80
80
BLI_INLINE void BMO_slot_map_bool_insert(BMOperator *op, BMOpSlot *slot,
81
 
                                        void *element, const int val)
 
81
                                        void *element, const bool val)
82
82
{
83
 
        union { void *ptr; int val; } t = {NULL};
 
83
        union { void *ptr; bool val; } t = {NULL};
84
84
        BLI_assert(slot->slot_subtype.map == BMO_OP_SLOT_SUBTYPE_MAP_BOOL);
85
 
        BLI_assert(val == false || val == true);
86
85
        BMO_slot_map_insert(op, slot, element, ((t.val = val), t.ptr));
87
86
}
88
87
 
170
169
 
171
170
        data = BMO_slot_map_data_get(slot, element);
172
171
        if (data) {
173
 
                return **(int **)data;
 
172
                return **(bool **)data;
174
173
        }
175
174
        else {
176
175
                return false;