diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-24 11:45:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-24 12:08:14 +0300 |
commit | 8f85cf033c75db784a18ed9f23f816107c9f226c (patch) | |
tree | 8631ff891ec984f5322f99c0d270d02412f59dc4 /source/blender/editors/interface/CMakeLists.txt | |
parent | a3cb9c8238072285c0c15c1f0a00aca6c0d5b746 (diff) | |
parent | e61bbc00b759b958c729ac3b014944416edd5d36 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/CMakeLists.txt')
-rw-r--r-- | source/blender/editors/interface/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index 07ba3b90e11..882db88879d 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/CMakeLists.txt @@ -44,6 +44,7 @@ set(SRC interface.c interface_align.c interface_anim.c + interface_context_menu.c interface_draw.c interface_eyedropper.c interface_eyedropper_color.c @@ -56,7 +57,6 @@ set(SRC interface_layout.c interface_ops.c interface_panel.c - interface_regions.c interface_region_color_picker.c interface_region_hud.c interface_region_menu_pie.c @@ -65,6 +65,7 @@ set(SRC interface_region_popup.c interface_region_search.c interface_region_tooltip.c + interface_regions.c interface_style.c interface_templates.c interface_utils.c |