diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-08 04:05:08 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-08 04:05:08 +0300 |
| commit | 6fbd210b9151e5c401330ca930b724f4d781bc48 (patch) | |
| tree | 8a197b21148e5c1589a61837b8cf920b6f54b9e9 /intern/ghost | |
| parent | cb58658f4145239082573aec49f261ce389a03ca (diff) | |
| parent | 931a279f441f6f9c3266d4789e9aa5aed1c16aa8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_TaskbarX11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_TaskbarX11.cpp b/intern/ghost/intern/GHOST_TaskbarX11.cpp index 2ef82dc6636..9826ccdfa37 100644 --- a/intern/ghost/intern/GHOST_TaskbarX11.cpp +++ b/intern/ghost/intern/GHOST_TaskbarX11.cpp @@ -44,7 +44,7 @@ static unity_event_loop_t unity_event_loop; static bool libunity_initialized = false; static bool libunity_available = false; -void* libunity_handle = NULL; +static void *libunity_handle = NULL; void GHOST_TaskBarX11::free() { |