[Bf-blender-cvs] [67c3791f63c] blender2.8: Object: minor changes to jump-to API

Campbell Barton noreply at git.blender.org
Wed Nov 21 03:08:21 CET 2018


Commit: 67c3791f63c03e205e2c4683988f8127f3a476e0
Author: Campbell Barton
Date:   Wed Nov 21 13:06:25 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB67c3791f63c03e205e2c4683988f8127f3a476e0

Object: minor changes to jump-to API

- Always select the jump-to object, even if it's active.
- Remove check for invalid object data
  (these cases will fail much earlier).

===================================================================

M	source/blender/editors/object/object_select.c

===================================================================

diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index 5873c972cae..1e69916d865 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -266,7 +266,7 @@ bool ED_object_jump_to_object(
 
 	/* TODO, use 'reveal_hidden', as is done with bones. */
 
-	if (view_layer->basact != base) {
+	if (view_layer->basact != base || !(base->flag & BASE_SELECTED)) {
 		/* Select if not selected. */
 		if (!(base->flag & BASE_SELECTED)) {
 			ED_object_base_deselect_all(view_layer, SEL_DESELECT);
@@ -303,10 +303,6 @@ bool ED_object_jump_to_bone(
 
 	bArmature *arm = ob->data;
 
-	if (arm == NULL || GS(arm->id.name) != ID_AR) {
-		return false;
-	}
-
 	/* Activate the armature object. */
 	if (!ED_object_jump_to_object(C, ob, reveal_hidden)) {
 		return false;



More information about the Bf-blender-cvs mailing list