diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 18:56:29 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 18:57:27 +0400 |
| commit | 73299516fa2ba8abbde2635754726e287bd2da94 (patch) | |
| tree | 67c2e858423c833b9cccdfc5cd8e2b828601421d /intern/cycles | |
| parent | f449542d6a099e3f98366cfe057034a882b76272 (diff) | |
Fix scons CUDA build and compile error with more strict compilers.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/SConscript | 2 | ||||
| -rw-r--r-- | intern/cycles/render/attribute.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/SConscript b/intern/cycles/kernel/SConscript index b2eafe6a83d..82aaccb62d6 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 e5b1ee7b95e..ce232e90ffc 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; } |