[Bf-blender-cvs] [07c01747179] master: Cycles: Fix build error

Ray Molenkamp noreply at git.blender.org
Tue Feb 26 16:33:54 CET 2019


Commit: 07c017471797a063308795df41ff2b70eb05532c
Author: Ray Molenkamp
Date:   Tue Feb 26 08:32:41 2019 -0700
Branches: master
https://developer.blender.org/rB07c017471797a063308795df41ff2b70eb05532c

Cycles: Fix build error

introduced by rBdabe5cd31add8aa55b9ad4bce1b591ed4e98f1a1

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

M	intern/cycles/device/opencl/opencl_split.cpp

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

diff --git a/intern/cycles/device/opencl/opencl_split.cpp b/intern/cycles/device/opencl/opencl_split.cpp
index 2880de62662..06eba52cec8 100644
--- a/intern/cycles/device/opencl/opencl_split.cpp
+++ b/intern/cycles/device/opencl/opencl_split.cpp
@@ -1724,11 +1724,11 @@ void OpenCLDevice::shader(DeviceTask& task)
 		kernel = bake_program(ustring("bake"));
 	}
 	else if(task.shader_eval_type == SHADER_EVAL_DISPLACE) {
-		assert(displace_program);
+		assert(displace_program());
 		kernel = displace_program(ustring("displace"));
 	}
 	else {
-		assert(background_program);
+		assert(background_program());
 		kernel = background_program(ustring("background"));
 	}



More information about the Bf-blender-cvs mailing list