archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: use function to set the active base

Browse Source
This commit is contained in:
Campbell Barton
2018-09-10 14:21:11 +10:00
parent bb9b0fcdbe
commit 2b5d4d426a
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/armature/armature_select.c
View File

@@ -54,6 +54,7 @@
#include "WM_types.h"
#include "ED_armature.h"
#include "ED_object.h"
#include "ED_screen.h"
#include "ED_select_utils.h"
#include "ED_view3d.h"
@@ -723,9 +724,7 @@ bool ED_armature_edit_select_pick(bContext *C, const int mval[2], bool extend, b
}
if (vc.view_layer->basact != basact) {
vc.view_layer->basact = basact;
DEG_id_tag_update(&vc.scene->id, DEG_TAG_SELECT_UPDATE);
WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, vc.scene);
ED_object_base_activate(C, basact);
}
}

5
source/blender/editors/mesh/editmesh_path.c
View File

@@ -48,6 +48,7 @@
#include "BKE_editmesh.h"
#include "BKE_report.h"
#include "ED_object.h"
#include "ED_mesh.h"
#include "ED_screen.h"
#include "ED_uvedit.h"
@@ -679,9 +680,7 @@ static int edbm_shortest_path_pick_invoke(bContext *C, wmOperator *op, const wmE
}
if (vc.view_layer->basact != basact) {
vc.view_layer->basact = basact;
DEG_id_tag_update(&vc.scene->id, DEG_TAG_SELECT_UPDATE);
WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, vc.scene);
ED_object_base_activate(C, basact);
}
/* to support redo */

6
source/blender/editors/mesh/editmesh_select.c
View File

@@ -57,6 +57,7 @@
#include "RNA_define.h"
#include "RNA_enum_types.h"
#include "ED_object.h"
#include "ED_mesh.h"
#include "ED_screen.h"
#include "ED_transform.h"
@@ -2216,10 +2217,9 @@ bool EDBM_select_pick(bContext *C, const int mval[2], bool extend, bool deselect
/* Changing active object is handy since it allows us to
* switch UV layers, vgroups for eg. */
if (vc.view_layer->basact != basact) {
vc.view_layer->basact = basact;
DEG_id_tag_update(&vc.scene->id, DEG_TAG_SELECT_UPDATE);
WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, vc.scene);
ED_object_base_activate(C, basact);
}
DEG_id_tag_update(vc.obedit->data, DEG_TAG_SELECT_UPDATE);
WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);