[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57549] trunk/blender/intern/cycles/util/ util_types.h: Cycles BVH Build fix for MSVC 2012.

Juergen Herrmann shadowrom at me.com
Tue Jun 18 14:32:44 CEST 2013


Revision: 57549
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57549
Author:   shadowrom
Date:     2013-06-18 12:32:43 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Cycles BVH Build fix for MSVC 2012.
needs to include intrin.h for _BitScanForward and _BitScanReverse.

Modified Paths:
--------------
    trunk/blender/intern/cycles/util/util_types.h

Modified: trunk/blender/intern/cycles/util/util_types.h
===================================================================
--- trunk/blender/intern/cycles/util/util_types.h	2013-06-18 11:55:32 UTC (rev 57548)
+++ trunk/blender/intern/cycles/util/util_types.h	2013-06-18 12:32:43 UTC (rev 57549)
@@ -23,6 +23,11 @@
 
 #include <stdlib.h>
 
+	// Needed for _BistScanForward and _BitScanReverse on MSVC 2012 
+#	if defined(_MSC_VER) && _MSC_VER >= 1700
+#		include <intrin.h>
+#	endif
+
 #endif
 
 /* Qualifiers for kernel code shared by CPU and GPU */




More information about the Bf-blender-cvs mailing list