diff options
author | Hans Goudey <h.goudey@me.com> | 2020-11-13 21:15:41 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-11-13 21:15:41 +0300 |
commit | 4c193f731e31664eae335f7f093699b7a6dfac42 (patch) | |
tree | f4f1dba3c636f70dbaa67c577debf95003b7922c | |
parent | e9b955b99cd3cde127b52bff8c4559e2d57eeeb0 (diff) |
Cleanup: Move PanelType flag from DNA to BKE header
Since this flag isn't saved in files and PanelType itself is defined in
BKE, the flag makes more sense there.
-rw-r--r-- | source/blender/blenkernel/BKE_screen.h | 13 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_screen_types.h | 13 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_ui.c | 1 |
3 files changed, 14 insertions, 13 deletions
diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h index fd5339940dd..81669fd6878 100644 --- a/source/blender/blenkernel/BKE_screen.h +++ b/source/blender/blenkernel/BKE_screen.h @@ -278,6 +278,19 @@ typedef struct PanelType { ExtensionRNA rna_ext; } PanelType; +/* #PanelType.flag */ +enum { + PNL_DEFAULT_CLOSED = (1 << 0), + PNL_NO_HEADER = (1 << 1), + /** Makes buttons in the header shrink/stretch to fill full layout width. */ + PNL_LAYOUT_HEADER_EXPAND = (1 << 2), + PNL_LAYOUT_VERT_BAR = (1 << 3), + /** This panel type represents data external to the UI. */ + PNL_INSTANCED = (1 << 4), + /** Draw panel like a box widget. */ + PNL_DRAW_BOX = (1 << 6), +}; + /* uilist types */ /* Draw an item in the uiList */ diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 7101dacc803..e42ff2a6e58 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -571,19 +571,6 @@ enum { PNL_INSTANCED_LIST_ORDER_CHANGED = (1 << 7), }; -/* paneltype flag */ -enum { - PNL_DEFAULT_CLOSED = (1 << 0), - PNL_NO_HEADER = (1 << 1), - /** Makes buttons in the header shrink/stretch to fill full layout width. */ - PNL_LAYOUT_HEADER_EXPAND = (1 << 2), - PNL_LAYOUT_VERT_BAR = (1 << 3), - /** This panel type represents data external to the UI. */ - PNL_INSTANCED = (1 << 4), - /** Draw panel like a box widget. */ - PNL_DRAW_BOX = (1 << 6), -}; - /* Fallback panel category (only for old scripts which need updating) */ #define PNL_CATEGORY_FALLBACK "Misc" diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index d87b3a6386e..2994d0eafb5 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -26,6 +26,7 @@ #include "BLT_translation.h" #include "BKE_idprop.h" +#include "BKE_screen.h" #include "BLI_listbase.h" |