diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-02-12 23:43:13 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-02-12 23:43:13 +0300 |
| commit | 10b24eabbab0193f6944cdf3bec7b386c75d5445 (patch) | |
| tree | 28cefb0f056191e09828cb79d2f7f728df4e2ead /source/blender/editors/include/ED_screen.h | |
| parent | f754ce1c5e050d1637fe97d78f782d6a68da6c15 (diff) | |
| parent | b104057d001d2472cc55c7fa51cff3275e331523 (diff) | |
Merge branch 'blender2.8' into transform-manipulators
Conflicts:
source/blender/editors/interface/resources.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/editors/transform/transform_manipulator.c
source/blender/gpu/CMakeLists.txt
source/blender/gpu/intern/gpu_shader.c
Diffstat (limited to 'source/blender/editors/include/ED_screen.h')
| -rw-r--r-- | source/blender/editors/include/ED_screen.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h index f5f66a07aea..01be63919be 100644 --- a/source/blender/editors/include/ED_screen.h +++ b/source/blender/editors/include/ED_screen.h @@ -162,6 +162,7 @@ int ED_operator_image_active(struct bContext *C); int ED_operator_nla_active(struct bContext *C); int ED_operator_logic_active(struct bContext *C); int ED_operator_info_active(struct bContext *C); +int ED_operator_collections_active(struct bContext *C); int ED_operator_console_active(struct bContext *C); |