tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-10-09 10:41:13 +11:00
parent cf03658adb 76f640c27d
commit 793d5cb7fd
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/device/opencl/opencl_base.cpp
View File

@ -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"));

4
intern/ghost/intern/GHOST_WindowWin32.cpp
View File

@ -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 */

4
intern/ghost/intern/GHOST_WindowWin32.h
View File

@ -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;
};