Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_outliner / outliner_tools.c
index 13200e92e7e37929a79cdfc5c0a0ce2120f8bce6..d6300b74aeac4e4ab21688c10c36cc4cd8799c5d 100644 (file)
@@ -380,7 +380,7 @@ static void object_select_hierarchy_cb(
        wmWindow *win = CTX_wm_window(C);
        int x = win->eventstate->mval[0];
        int y = win->eventstate->mval[1];
-       outliner_item_do_activate(C, x, y, true, true);
+       outliner_item_activate_or_toggle_closed(C, x, y, true, true);
 }
 
 
@@ -442,6 +442,9 @@ static void id_local_cb(
                if (id_make_local(bmain, tselem->id, false, false) == false) {
                        id_clear_lib_data(bmain, tselem->id);
                }
+               else {
+                       BKE_main_id_clear_newpoins(bmain);
+               }
        }
 }