NLA SoC: Merge from 2.5
[blender-staging.git] / source / blender / editors / space_view3d / space_view3d.c
index eaff77aabe92511d7da1de517bbe43812563e1fb..0cb0fd90860c6228a67fd263fbcedc6ea37f1c00 100644 (file)
@@ -564,7 +564,17 @@ static int view3d_context(const bContext *C, const char *member, bContextDataRes
 
        if(v3d==NULL) return 0;
 
-       if(CTX_data_equals(member, "selected_objects") || CTX_data_equals(member, "selected_bases")) {
+       if(CTX_data_dir(member)) {
+               static const char *dir[] = {
+                       "selected_objects", "selected_bases" "selected_editable_objects",
+                       "selected_editable_bases" "visible_objects", "visible_bases",
+                       "active_base", "active_object", "visible_bones", "editable_bones",
+                       "selected_bones", "selected_editable_bones" "visible_pchans",
+                       "selected_pchans", "active_bone", "active_pchan", NULL};
+
+               CTX_data_dir_set(result, dir);
+       }
+       else if(CTX_data_equals(member, "selected_objects") || CTX_data_equals(member, "selected_bases")) {
                int selected_objects= CTX_data_equals(member, "selected_objects");
 
                for(base=scene->base.first; base; base=base->next) {