diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-01-31 11:03:45 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-31 11:03:45 +0300 |
commit | 6d55b522feb61a6cc03d04cbc2fca23713964084 (patch) | |
tree | ca59c77a7db79e09d08b15f585fa90ae763f7a00 /source/blender/makesdna | |
parent | afaca68ea86edd921f40cf45c245eaf8b5fc053a (diff) | |
parent | 87608e66e174068f9471619a5fe153fd279c4947 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index caaf862a12f..3da0bdb6ca2 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -412,7 +412,6 @@ typedef struct bTheme { #define UI_THEMESPACE_START(btheme) (CHECK_TYPE_INLINE(btheme, bTheme *), &((btheme)->tbuts)) #define UI_THEMESPACE_END(btheme) (CHECK_TYPE_INLINE(btheme, bTheme *), (&((btheme)->tclip) + 1)) -/* for the moment only the name. may want to store options with this later */ typedef struct bAddon { struct bAddon *next, *prev; char module[64]; |