diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-09 02:41:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-09 02:41:13 +0300 |
| commit | 793d5cb7fde4d642f1d67485c6b9819d266d994c (patch) | |
| tree | b38242dce925b144d2b99efdd3b47973b3478b3c /intern | |
| parent | cf03658adbbc17d093be123c06d1611c25c7fea6 (diff) | |
| parent | 76f640c27d896e174d3581acfd3a718772d18f11 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/device/opencl/opencl_base.cpp | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowWin32.cpp | 4 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowWin32.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/device/opencl/opencl_base.cpp b/intern/cycles/device/opencl/opencl_base.cpp index ffd3b7d7625..1e73d37d7a4 100644 --- a/intern/cycles/device/opencl/opencl_base.cpp +++ b/intern/cycles/device/opencl/opencl_base.cpp @@ -761,7 +761,7 @@ bool OpenCLDeviceBase::denoising_non_local_means(device_ptr image_ptr, cl_mem variance_mem = CL_MEM_PTR(variance_ptr); cl_mem out_mem = CL_MEM_PTR(out_ptr); - mem_zero_kernel(*difference, sizeof(float)*pass_stride); + mem_zero_kernel(*weightAccum, sizeof(float)*pass_stride); mem_zero_kernel(out_ptr, sizeof(float)*pass_stride); cl_kernel ckNLMCalcDifference = denoising_program(ustring("filter_nlm_calc_difference")); diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index c2aaa018609..8cd943d35df 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -1088,12 +1088,12 @@ GHOST_TSuccess GHOST_WindowWin32::endProgressBar() #ifdef WITH_INPUT_IME void GHOST_WindowWin32::beginIME(GHOST_TInt32 x, GHOST_TInt32 y, GHOST_TInt32 w, GHOST_TInt32 h, int completed) { - m_imeImput.BeginIME(m_hWnd, GHOST_Rect(x, y - h, x, y), (bool)completed); + m_imeInput.BeginIME(m_hWnd, GHOST_Rect(x, y - h, x, y), (bool)completed); } void GHOST_WindowWin32::endIME() { - m_imeImput.EndIME(m_hWnd); + m_imeInput.EndIME(m_hWnd); } #endif /* WITH_INPUT_IME */ diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h index c72669ed898..9907385154a 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.h +++ b/intern/ghost/intern/GHOST_WindowWin32.h @@ -265,7 +265,7 @@ public: bool m_inLiveResize; #ifdef WITH_INPUT_IME - GHOST_ImeWin32 *getImeInput() {return &m_imeImput;} + GHOST_ImeWin32 *getImeInput() {return &m_imeInput;} void beginIME( GHOST_TInt32 x, GHOST_TInt32 y, @@ -369,7 +369,7 @@ private: #ifdef WITH_INPUT_IME /** Handle input method editors event */ - GHOST_ImeWin32 m_imeImput; + GHOST_ImeWin32 m_imeInput; #endif bool m_debug_context; }; |