More housecleaning (BASACT > BASACT_NEW)

2 files changed, 8 insertions, 6 deletions

diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index 1cd80327b42..2437a6bff28 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -1683,14 +1683,14 @@ static bool get_new_constraint_target(bContext *C, int con_type, Object **tar_ob
 		Main *bmain = CTX_data_main(C);
 		Scene *scene = CTX_data_scene(C);
 		SceneLayer *sl = CTX_data_scene_layer(C);
-		BaseLegacy *base = BASACT, *newbase = NULL;
+		Base *base = BASACT_NEW, *newbase = NULL;
 		Object *obt;
 		
 		/* add new target object */
 		obt = BKE_object_add(bmain, scene, sl, OB_EMPTY, NULL);
 		
 		/* set layers OK */
-		newbase = BASACT;
+		newbase = BASACT_NEW;
 		newbase->lay = base->lay;
 		obt->lay = newbase->lay;
 		
@@ -1709,8 +1709,8 @@ static bool get_new_constraint_target(bContext *C, int con_type, Object **tar_ob
 		}
 
 		/* restore, BKE_object_add sets active */
-		BASACT = base;
-		base->flag_legacy |= SELECT;
+		BASACT_NEW = base;
+		base->flag |= BASE_SELECTED;
 		
 		/* make our new target the new object */
 		*tar_ob = obt;
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index 961278c2c83..37232456f48 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -403,6 +403,7 @@ void ED_object_select_linked_by_id(bContext *C, ID *id)
 static int object_select_linked_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
+	SceneLayer *sl = CTX_data_scene_layer(C);
 	Object *ob;
 	int nr = RNA_enum_get(op->ptr, "type");
 	bool changed = false, extend;
@@ -417,7 +418,7 @@ static int object_select_linked_exec(bContext *C, wmOperator *op)
 		CTX_DATA_END;
 	}
 	
-	ob = OBACT;
+	ob = OBACT_NEW;
 	if (ob == NULL) {
 		BKE_report(op->reports, RPT_ERROR, "No active object");
 		return OPERATOR_CANCELLED;
@@ -814,6 +815,7 @@ static bool select_grouped_keyingset(bContext *C, Object *UNUSED(ob), ReportList
 static int object_select_grouped_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
+	SceneLayer *sl = CTX_data_scene_layer(C);
 	Object *ob;
 	const int type = RNA_enum_get(op->ptr, "type");
 	bool changed = false, extend;
@@ -829,7 +831,7 @@ static int object_select_grouped_exec(bContext *C, wmOperator *op)
 		CTX_DATA_END;
 	}
 
-	ob = OBACT;
+	ob = OBACT_NEW;
 	if (ob == NULL) {
 		BKE_report(op->reports, RPT_ERROR, "No active object");
 		return OPERATOR_CANCELLED;