[Bf-blender-cvs] [9aafec1] master: Cycles: Avoid multiple spaces in OpenCL build options

Sergey Sharybin noreply at git.blender.org
Sat Nov 21 17:35:06 CET 2015


Commit: 9aafec1ce1bfdb815c2ed6fe2da83f9451fde3e4
Author: Sergey Sharybin
Date:   Sat Nov 21 21:33:08 2015 +0500
Branches: master
https://developer.blender.org/rB9aafec1ce1bfdb815c2ed6fe2da83f9451fde3e4

Cycles: Avoid multiple spaces in OpenCL build options

This should solve some compilation errors with compilation on OSX.

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

M	intern/cycles/device/device_opencl.cpp

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

diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index d6b1ab3..0db11e0 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -1385,7 +1385,7 @@ public:
 protected:
 	string kernel_build_options(const string *debug_src = NULL)
 	{
-		string build_options = " -cl-fast-relaxed-math ";
+		string build_options = "-cl-fast-relaxed-math ";
 
 		if(platform_name == "NVIDIA CUDA") {
 			build_options += "-D__KERNEL_OPENCL_NVIDIA__ "
@@ -1555,9 +1555,9 @@ protected:
 	{
 		string build_options = "";
 		if(requested_features.experimental) {
-			build_options += " -D__KERNEL_EXPERIMENTAL__";
+			build_options += "-D__KERNEL_EXPERIMENTAL__ ";
 		}
-		build_options += " -D__NODES_MAX_GROUP__=" +
+		build_options += "-D__NODES_MAX_GROUP__=" +
 			string_printf("%d", requested_features.max_nodes_group);
 		build_options += " -D__NODES_FEATURES__=" +
 			string_printf("%d", requested_features.nodes_features);




More information about the Bf-blender-cvs mailing list