Merge branch 'release-0.9.1'

RenderKit · Dec 15, 2021 · ea72ad9 · ea72ad9
2 parents a170d41 + af49d50
commit ea72ad9
Show file tree

Hide file tree

Showing 11 changed files with 7,348 additions and 3,959 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -210,6 +210,20 @@ build-windows-msvc15-dev:
   script:
     - gitlab\win-dev.ps1
 
+build-windows-icl:
+  stage: build
+  extends:
+    - .windows
+  tags: [ win, icc19_2 ]
+  script:
+    - mkdir build-win-icl
+    - cd build-win-icl
+    - cmake -L .. -G "Visual Studio 16 2019" -T "Intel C++ Compiler 19.2" -DCMAKE_INSTALL_PREFIX="install"
+    - cmake --build . --config Release --target install
+  artifacts:
+    paths:
+        - build-win-icl
+
 build-kw-dev:
   stage: build
   extends: .ubuntu18.04

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,19 @@
 Version History
 ---------------
 
+### Changes in OSPRay Studio v0.9.1
+
+-   Compatible with OSPRay release v2.8.0
+
+- Features and Improvements
+  - Added simplified basic 5-step build instructions to README.md
+<br>
+
+- Bug Fixes:
+  - Fixed compatibility with Intel® C++ Compiler Classic on Windows OS.
+  - Fixed potential crash in FileDialog selection widget.
+  - Fixed "gray screen" no-image issue seen on some older architectures
+
 ### Changes in OSPRay Studio v0.9.0
 
 -   Compatible with OSPRay release v2.8.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 cmake_minimum_required(VERSION 3.15)
 
-project(ospray_studio VERSION 0.9.0 LANGUAGES CXX)
+project(ospray_studio VERSION 0.9.1 LANGUAGES CXX)
 
 include(GNUInstallDirs)
 include(ProcessorCount)

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # OSPRay Studio
 
-This is release v0.9.0 of Intel® OSPRay Studio. It is released under the
+This is release v0.9.1 of Intel® OSPRay Studio. It is released under the
 Apache 2.0 license.
 
 Visit [**OSPRay Studio**](http://www.ospray.org/ospray_studio)
@@ -25,6 +25,15 @@ or scivis renderer.
 
 ## Building OSPRay Studio
 
+tl;dr - For most installations, these 5 steps will build a plain vanilla OSPRay Studio
+``` bash
+  1. git clone https://github.com/ospray/ospray_studio.git
+  2. mkdir ospray_studio/build
+  3. cd ospray_studio/build
+  4. cmake ..
+  5. cmake --build .
+```
+
 OSPRay Studio has the following required and optional dependencies.
 
 ### Required dependencies

diff --git a/external/imgui/imgui.h b/external/imgui/imgui.h
@@ -104,7 +104,7 @@ Index of this file:
 #endif
 
 // Disable some of MSVC most aggressive Debug runtime checks in function header/footer (used in some simple/low-level functions)
-#if defined(_MSC_VER) && !defined(__clang__) && !defined(IMGUI_DEBUG_PARANOID)
+#if defined(_MSC_VER) && !defined(__clang__) && !defined(__INTEL_COMPILER) && !defined(IMGUI_DEBUG_PARANOID)
 #define IM_MSVC_RUNTIME_CHECKS_OFF      __pragma(runtime_checks("",off))     __pragma(check_stack(off)) __pragma(strict_gs_check(push,off))
 #define IM_MSVC_RUNTIME_CHECKS_RESTORE  __pragma(runtime_checks("",restore)) __pragma(check_stack())    __pragma(strict_gs_check(pop))
 #else