[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41673] trunk/blender: Cycles Merge:

[Brecht Van Lommel]

Revision: 41673
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41673
Author:   blendix
Date:     2011-11-08 17:53:49 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
Cycles Merge:
* It seems we have a problem compiling the CUDA kernel at runtime on Windows,
  will need to investigate more how to solve this best, CPU render should go
  fine though.
* Change OPENIMAGEIO to OPENIMAGEIO_ROOT_DIR on linux for consistency.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/intern/cycles/device/device_cuda.cpp

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-11-08 17:19:14 UTC (rev 41672)
+++ trunk/blender/CMakeLists.txt	2011-11-08 17:53:49 UTC (rev 41673)
@@ -519,7 +519,6 @@
 	if(WITH_OPENIMAGEIO)
 		set(OPENIMAGEIO "/usr" CACHE PATH "OpenImageIO Directory")
 
-		set(OPENIMAGEIO_ROOT_DIR ${OPENIMAGEIO})
 		find_package(OpenImageIO)
 
 		set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})

Modified: trunk/blender/intern/cycles/device/device_cuda.cpp
===================================================================
--- trunk/blender/intern/cycles/device/device_cuda.cpp	2011-11-08 17:19:14 UTC (rev 41672)
+++ trunk/blender/intern/cycles/device/device_cuda.cpp	2011-11-08 17:53:49 UTC (rev 41673)
@@ -242,7 +242,7 @@
 
 		path_create_directories(cubin);
 
-		string command = string_printf("%s -arch=sm_%d%d -m%d --cubin \"%s\" --use_fast_math "
+		string command = string_printf("\"%s\" -arch=sm_%d%d -m%d --cubin \"%s\" --use_fast_math "
 			"-o \"%s\" --ptxas-options=\"-v\" --maxrregcount=%d --opencc-options -OPT:Olimit=0 -I\"%s\" -DNVCC",
 			nvcc.c_str(), major, minor, machine, kernel.c_str(), cubin.c_str(), maxreg, include.c_str());