[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57283] trunk/blender/intern/cycles: Fix CUDA/OpenCL build after last commit.
Brecht Van Lommel
brechtvanlommel at pandora.be
Fri Jun 7 18:09:52 CEST 2013
Revision: 57283
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57283
Author: blendix
Date: 2013-06-07 16:09:52 +0000 (Fri, 07 Jun 2013)
Log Message:
-----------
Fix CUDA/OpenCL build after last commit.
Modified Paths:
--------------
trunk/blender/intern/cycles/render/session.cpp
trunk/blender/intern/cycles/util/util_types.h
Modified: trunk/blender/intern/cycles/render/session.cpp
===================================================================
--- trunk/blender/intern/cycles/render/session.cpp 2013-06-07 16:06:22 UTC (rev 57282)
+++ trunk/blender/intern/cycles/render/session.cpp 2013-06-07 16:09:52 UTC (rev 57283)
@@ -732,7 +732,7 @@
/* number of samples is needed by multi jittered sampling pattern */
Integrator *integrator = scene->integrator;
- if(integrator->sampling_pattern = SAMPLING_PATTERN_CMJ) {
+ if(integrator->sampling_pattern == SAMPLING_PATTERN_CMJ) {
int aa_samples = tile_manager.num_samples;
if(aa_samples != integrator->aa_samples) {
Modified: trunk/blender/intern/cycles/util/util_types.h
===================================================================
--- trunk/blender/intern/cycles/util/util_types.h 2013-06-07 16:06:22 UTC (rev 57282)
+++ trunk/blender/intern/cycles/util/util_types.h 2013-06-07 16:09:52 UTC (rev 57283)
@@ -59,6 +59,8 @@
/* SIMD Types */
+#ifndef __KERNEL_GPU__
+
/* not enabled, globally applying it just gives slowdown,
* but useful for testing. */
//#define __KERNEL_SSE__
@@ -88,11 +90,11 @@
#endif
#ifndef _WIN32
-#ifndef __KERNEL_GPU__
#include <stdint.h>
#endif
+
#endif
CCL_NAMESPACE_BEGIN
More information about the Bf-blender-cvs
mailing list