[Bf-blender-cvs] [4f11ffcce74] blender2.8: Fix outliner crash clicking on pose bones
Campbell Barton
noreply at git.blender.org
Wed May 31 14:51:23 CEST 2017
Commit: 4f11ffcce74cfb0b87d69d017aa0c3371f78e320
Author: Campbell Barton
Date: Wed May 31 22:16:13 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB4f11ffcce74cfb0b87d69d017aa0c3371f78e320
Fix outliner crash clicking on pose bones
>From 15317775c, we can't assume directdata is a Base.
This matches logic from master.
===================================================================
M source/blender/editors/space_outliner/outliner_select.c
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index e61ded299d1..931af08c717 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -165,11 +165,7 @@ static eOLDrawState tree_element_set_active_object(
}
/* find associated base in current scene */
- if (te->directdata) {
- base = te->directdata;
- } else {
- base = BKE_scene_layer_base_find(sl, ob);
- }
+ base = BKE_scene_layer_base_find(sl, ob);
if (base) {
if (set == OL_SETSEL_EXTEND) {
More information about the Bf-blender-cvs
mailing list