diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-15 08:55:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-15 08:56:20 +0300 |
| commit | f7c1716b6cb79d0e4f31b3b449d0c565970db7e7 (patch) | |
| tree | 9f91b524d396144f60c79159beda4ea9ccc46b3c /intern | |
| parent | 054af691c09ac083b6bb77a7635e34ed76324d0e (diff) | |
| parent | c3e3ccd42ccfcb6725f4d2d3b96afbf6339304a6 (diff) | |
Merge branch 'master' into blender2.8
Fixes enum-flags having no text w/ property-split
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/device/opencl/opencl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/opencl/opencl.h b/intern/cycles/device/opencl/opencl.h index d0571fc3c14..6c73d10a376 100644 --- a/intern/cycles/device/opencl/opencl.h +++ b/intern/cycles/device/opencl/opencl.h @@ -271,7 +271,7 @@ public: class OpenCLProgram { public: - OpenCLProgram() : loaded(false), device(NULL) {} + OpenCLProgram() : loaded(false), program(NULL), device(NULL) {} OpenCLProgram(OpenCLDeviceBase *device, const string& program_name, const string& kernel_name, |