diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-19 05:14:36 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-19 05:14:36 +0300 |
commit | f35e9f047a0381732a41ec331945b7a0654ee578 (patch) | |
tree | 5be3c632483cf2bc2960b21789849af27c9b2b59 /source/blender/compositor | |
parent | 0ad183bf0289c3b9b1af0cd581bc30435cae3800 (diff) | |
parent | bb3ec3ebafbc2c0e5d8530148a433242e0adad30 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor')
-rw-r--r-- | source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp index f7b8d285cc2..35290d66444 100644 --- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp +++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp @@ -62,7 +62,7 @@ void ScreenLensDistortionOperation::initExecution() this->initMutex(); uint rng_seed = (uint)(PIL_check_seconds_timer_i() & UINT_MAX); - rng_seed ^= (uint)GET_INT_FROM_POINTER(m_inputProgram); + rng_seed ^= (uint)POINTER_AS_INT(m_inputProgram); this->m_rng = BLI_rng_new(rng_seed); this->m_cx = 0.5f * (float)getWidth(); |