diff options
| author | Jean-Luc Peurière <jlp@nerim.net> | 2008-03-14 02:54:02 +0300 |
|---|---|---|
| committer | Jean-Luc Peurière <jlp@nerim.net> | 2008-03-14 02:54:02 +0300 |
| commit | a68a7f42b02ad0260220d94f36ab61c772db071a (patch) | |
| tree | 620b763cd24fbfc1259f00ccb005217914af0c6f /source/blender/include/mydevice.h | |
| parent | 526d0bec4722900a86d81ff0f5d71504b2b4ad8c (diff) | |
| parent | 15215493bf9d1d08e650109e6eb6189fc76e289e (diff) | |
resolved conflict state with HEAD r14096
blenderbuttons still bad
not let this compile
Diffstat (limited to 'source/blender/include/mydevice.h')
| -rw-r--r-- | source/blender/include/mydevice.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/include/mydevice.h b/source/blender/include/mydevice.h index 9a8d154e030..949c9f57851 100644 --- a/source/blender/include/mydevice.h +++ b/source/blender/include/mydevice.h @@ -257,6 +257,8 @@ #define REDRAWANIM 0x4037 #define REDRAWNODE 0x4038 #define RECALC_COMPOSITE 0x4039 +#define REDRAWMARKER 0x4040 /* all views that display markers */ +#define REDRAWVIEW3D_IMAGE 0x4041 #endif /* !__MYDEVICE_H__ */ |