Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / source / blender / editors / include / ED_screen.h
index 0153b3c..6cb7593 100644 (file)
@@ -58,7 +58,6 @@ void  ED_region_panels_init(struct wmWindowManager *wm, struct ARegion *ar);
 void   ED_region_panels(const struct bContext *C, struct ARegion *ar, int vertical, char *context, int contextnr);
 void   ED_region_header_init(struct ARegion *ar);
 void   ED_region_header(const struct bContext *C, struct ARegion *ar);
-void   region_scissor_winrct(struct ARegion *ar, struct rcti *winrct);
 
 /* spaces */
 void   ED_spacetypes_init(void);
@@ -150,7 +149,7 @@ int         ED_operator_posemode(struct bContext *C);
 #define ED_KEYMAP_MARKERS      4
 #define ED_KEYMAP_ANIMATION    8
 #define ED_KEYMAP_FRAMES       16
-#define ED_KEYMAP_GPENCIL      32
+
 
 #endif /* ED_SCREEN_H */