code cleanup: rename BKE_tessmesh -> BKE_editmesh, rename EditDerivedBMesh.tc ->...
[blender-staging.git] / source / blender / editors / object / object_relations.c
index 6039ff6d34b64343f58a8dfa8a27be4fc4f4100c..5a688d7daf388c5ce59a91627727c4ff5d85478c 100644 (file)
@@ -85,7 +85,7 @@
 #include "BKE_scene.h"
 #include "BKE_speaker.h"
 #include "BKE_texture.h"
-#include "BKE_tessmesh.h"
+#include "BKE_editmesh.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -549,7 +549,7 @@ void OBJECT_OT_parent_clear(wmOperatorType *ot)
        /* flags */
        ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
        
-       ot->prop = RNA_def_enum(ot->srna, "type", prop_clear_parent_types, 0, "Type", "");
+       ot->prop = RNA_def_enum(ot->srna, "type", prop_clear_parent_types, CLEAR_PARENT_ALL, "Type", "");
 }
 
 /* ******************** Make Parent Operator *********************** */
@@ -843,20 +843,20 @@ static int parent_set_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent
        return OPERATOR_CANCELLED;
 }
 
-static int parent_set_draw_check_prop(PointerRNA *ptr, PropertyRNA *prop)
+static bool parent_set_draw_check_prop(PointerRNA *ptr, PropertyRNA *prop)
 {
        const char *prop_id = RNA_property_identifier(prop);
        int type = RNA_enum_get(ptr, "type");
 
        /* Only show XMirror for PAR_ARMATURE_ENVELOPE and PAR_ARMATURE_AUTO! */
-       if (strcmp(prop_id, "xmirror") == 0) {
+       if (STREQ(prop_id, "xmirror")) {
                if (ELEM(type, PAR_ARMATURE_ENVELOPE, PAR_ARMATURE_AUTO))
-                       return TRUE;
+                       return true;
                else
-                       return FALSE;
+                       return false;
        }
 
-       return TRUE;
+       return true;
 }
 
 static void parent_set_ui(bContext *C, wmOperator *op)
@@ -1486,7 +1486,7 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
                                                /* now add in the groups from the link nodes */
                                                for (group_node = ob_groups; group_node; group_node = group_node->next) {
                                                        if (ob_dst->dup_group != group_node->link) {
-                                                               add_to_group(group_node->link, ob_dst, scene, base_dst);
+                                                               BKE_group_object_add(group_node->link, ob_dst, scene, base_dst);
                                                        }
                                                        else {
                                                                is_cycle = TRUE;