[Bf-blender-cvs] [7329951] master: Fix scons CUDA build and compile error with more strict compilers.

Brecht Van Lommel noreply at git.blender.org
Sat Mar 29 15:58:00 CET 2014


Commit: 73299516fa2ba8abbde2635754726e287bd2da94
Author: Brecht Van Lommel
Date:   Sat Mar 29 15:56:29 2014 +0100
https://developer.blender.org/rB73299516fa2ba8abbde2635754726e287bd2da94

Fix scons CUDA build and compile error with more strict compilers.

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

M	intern/cycles/kernel/SConscript
M	intern/cycles/render/attribute.cpp

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

diff --git a/intern/cycles/kernel/SConscript b/intern/cycles/kernel/SConscript
index b2eafe6..82aaccb 100644
--- a/intern/cycles/kernel/SConscript
+++ b/intern/cycles/kernel/SConscript
@@ -77,7 +77,7 @@ if env['WITH_BF_CYCLES_CUDA_BINARIES']:
     nvcc_flags += " --cubin --ptxas-options=\"-v\""
     nvcc_flags += " -D__KERNEL_CUDA_VERSION__=%d" % (cuda_version)
     nvcc_flags += " -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC"
-    nvcc_flags += " -I \"%s\" -I \"%s\" -I \"%s\"" % (util_dir, svm_dir, geom_dir, closure_dir)
+    nvcc_flags += " -I \"%s\" -I \"%s\" -I \"%s\" -I \"%s\"" % (util_dir, svm_dir, geom_dir, closure_dir)
 
     # dependencies
     dependencies = ['kernel.cu'] + kernel.Glob('*.h') + kernel.Glob('../util/*.h') + kernel.Glob('svm/*.h') + kernel.Glob('geom/*.h') + kernel.Glob('closure/*.h')
diff --git a/intern/cycles/render/attribute.cpp b/intern/cycles/render/attribute.cpp
index e5b1ee7..ce232e9 100644
--- a/intern/cycles/render/attribute.cpp
+++ b/intern/cycles/render/attribute.cpp
@@ -223,9 +223,9 @@ const char *Attribute::standard_name(AttributeStandard std)
 
 AttributeStandard Attribute::name_standard(const char *name)
 {
-	for(AttributeStandard std = ATTR_STD_NONE; std < ATTR_STD_NUM; std++)
-		if(strcmp(name, Attribute::standard_name(std)) == 0)
-			return std;
+	for(int std = ATTR_STD_NONE; std < ATTR_STD_NUM; std++)
+		if(strcmp(name, Attribute::standard_name((AttributeStandard)std)) == 0)
+			return (AttributeStandard)std;
 
 	return ATTR_STD_NONE;
 }




More information about the Bf-blender-cvs mailing list