Merge branch 'master' into blender2.8
This commit is contained in:
commit
793d5cb7fd
@ -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"));
|
||||
|
@ -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 */
|
||||
|
@ -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;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user