=bmesh= merge from trunk at r36529
[blender.git] / source / blender / editors / space_image / space_image.c
index 381d4ff4ab392ccbb5bf0de8cb2a5b4e630d5b7e..ece0169cf59b33e95494055ef52f7a4f48e0392e 100644 (file)
@@ -495,7 +495,6 @@ static void image_operatortypes(void)
 
        WM_operatortype_append(IMAGE_OT_record_composite);
 
-       WM_operatortype_append(IMAGE_OT_toolbox);
        WM_operatortype_append(IMAGE_OT_properties);
        WM_operatortype_append(IMAGE_OT_scopes);
 }
@@ -543,8 +542,6 @@ static void image_keymap(struct wmKeyConfig *keyconf)
        RNA_enum_set(WM_keymap_add_item(keymap, "IMAGE_OT_curves_point_set", ACTIONMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "point", 0);
        RNA_enum_set(WM_keymap_add_item(keymap, "IMAGE_OT_curves_point_set", ACTIONMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "point", 1);
 
-       WM_keymap_add_item(keymap, "IMAGE_OT_toolbox", SPACEKEY, KM_PRESS, 0, 0);
-
        /* toggle editmode is handy to have while UV unwrapping */
        kmi= WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", TABKEY, KM_PRESS, 0, 0);
        RNA_enum_set(kmi->ptr, "mode", OB_MODE_EDIT);
@@ -986,6 +983,7 @@ void ED_spacetype_image(void)
        BLI_addhead(&st->regiontypes, art);
 
        image_buttons_register(art);
+       ED_uvedit_buttons_register(art);
        
        /* regions: statistics/scope buttons */
        art= MEM_callocN(sizeof(ARegionType), "spacetype image region");