[Bf-blender-cvs] [3de96a9] cycles_split_kernel: Cycles: Remove uses of nullptr

[Mai Lavelle]

Commit: 3de96a99cafb56781320064bfab79daf8bd974c2
Author: Mai Lavelle
Date:   Sun Nov 20 13:12:19 2016 -0500
Branches: cycles_split_kernel
https://developer.blender.org/rB3de96a99cafb56781320064bfab79daf8bd974c2

Cycles: Remove uses of nullptr

We're avoiding C++11 language features for now.

===================================================================

M	intern/cycles/device/device_cpu.cpp

===================================================================

diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 85c6d91..15395cc 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -137,7 +137,7 @@ class CPUDevice : public Device
 
 		if(it == kernel_functions.end()) {
 			assert(!"kernel function not found");
-			return nullptr;
+			return NULL;
 		}
 
 		return (F)it->second;
@@ -781,7 +781,7 @@ protected:
 		kernel->func = get_kernel_function<void(*)(KernelGlobals*, KernelData*)>(kernel_name);
 		if(!kernel->func) {
 			delete kernel;
-			return nullptr;
+			return NULL;
 		}
 
 		return kernel;