Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 8 Jul 2017 21:45:36 +0000 (23:45 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 8 Jul 2017 21:45:36 +0000 (23:45 +0200)
intern/cycles/render/osl.cpp
intern/ghost/intern/GHOST_SystemWin32.cpp

index 6bff29d1c761f76ab6920ed153f875fb054cecb3..a794f233718cd738463628b4428c49753aa4ccd7 100644 (file)
@@ -156,6 +156,7 @@ void OSLShaderManager::device_free(Device *device, DeviceScene *dscene, Scene *s
        og->surface_state.clear();
        og->volume_state.clear();
        og->displacement_state.clear();
+       og->bump_state.clear();
        og->background_state.reset();
 }
 
index 9f03b5e9537e612ad54766739c792b1844c762f6..b0dae432643ffd6760ea98dabc007b537188a267 100644 (file)
@@ -941,6 +941,8 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
        GHOST_ASSERT(system, "GHOST_SystemWin32::s_wndProc(): system not initialized");
 
        if (hwnd) {
+#if 0
+               // Disabled due to bug in Intel drivers, see T51959
                if(msg == WM_NCCREATE) {
                        // Tell Windows to automatically handle scaling of non-client areas
                        // such as the caption bar. EnableNonClientDpiScaling was introduced in Windows 10
@@ -954,6 +956,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
                                }
                        }
                }
+#endif
 
                GHOST_WindowWin32 *window = (GHOST_WindowWin32 *)::GetWindowLongPtr(hwnd, GWLP_USERDATA);
                if (window) {