Merged revision(s) 59035-59107 from trunk/blender into soc-2013-dingto.
[blender.git] / intern / cycles / device / device_cuda.cpp
index 722d0380c2211d7b617dc6e6abe623b6d126ea53..9cf0879742e5cf6b24a6f3a3ce78082bcedffeee 100644 (file)
@@ -572,8 +572,11 @@ public:
                /* get kernel function */
                if(progressive)
                        cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_path_trace_progressive"))
                /* get kernel function */
                if(progressive)
                        cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_path_trace_progressive"))
-               else
+               else {
                        cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_path_trace_non_progressive"))
                        cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_path_trace_non_progressive"))
+                       if(have_error())
+                               return;
+               }
                
                /* pass in parameters */
                int offset = 0;
                
                /* pass in parameters */
                int offset = 0;