diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-12 06:02:53 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-12 06:02:53 +0400 |
| commit | 94ae0232b0337ab70cecaef03cd845887cd36eaa (patch) | |
| tree | caea2819c7fe0400fb91c9bdf0e99a9e0fd50cf6 /source/blender/editors/include/UI_resources.h | |
| parent | 9a109c22ae1ef8a5c75932d661610b23ec685bd7 (diff) | |
| parent | f68e9db583489d541d535791536ea20bc1ae1d76 (diff) | |
Merged changes in the trunk up to revision 53729.
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/editors/include/UI_resources.h')
| -rw-r--r-- | source/blender/editors/include/UI_resources.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 1035f5815f2..29b1a74e859 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -228,7 +228,11 @@ enum { TH_AXIS_X, /* X/Y/Z Axis */ TH_AXIS_Y, - TH_AXIS_Z + TH_AXIS_Z, + + TH_LOW_GRAD, + TH_HIGH_GRAD, + TH_SHOW_BACK_GRAD }; /* XXX WARNING: previous is saved in file, so do not change order! */ |