Merge branch 'blender2.7'

Referenced by issue #62582, Cycles viewport render stuck with stereoscopic viewport

build_files/build_environment/cmake/openal.cmake

@@ -18,18 +18,31 @@
 
 if(BUILD_MODE STREQUAL Release)
 	set(OPENAL_EXTRA_ARGS
-		-DALSOFT_UTILS=Off
-		-DALSOFT_NO_CONFIG_UTIL=On
-		-DALSOFT_EXAMPLES=Off
-		-DALSOFT_TESTS=Off
-		-DALSOFT_CONFIG=Off
-		-DALSOFT_HRTF_DEFS=Off
-		-DALSOFT_INSTALL=On
-		-DALSOFT_BACKEND_SNDIO=Off
+		-DALSOFT_UTILS=OFF
+		-DALSOFT_NO_CONFIG_UTIL=ON
+		-DALSOFT_EXAMPLES=OFF
+		-DALSOFT_TESTS=OFF
+		-DALSOFT_CONFIG=OFF
+		-DALSOFT_HRTF_DEFS=OFF
+		-DALSOFT_INSTALL=ON
+		-DALSOFT_BACKEND_SNDIO=OFF
 	)
 
 	if(UNIX)
-		set(OPENAL_EXTRA_ARGS ${OPENAL_EXTRA_ARGS} -DLIBTYPE=STATIC)
+		set(OPENAL_EXTRA_ARGS
+			${OPENAL_EXTRA_ARGS}
+			-DLIBTYPE=STATIC
+		)
+	endif()
+
+	if(UNIX AND NOT APPLE)
+		# Ensure we have backends for playback.
+		set(OPENAL_EXTRA_ARGS
+			${OPENAL_EXTRA_ARGS}
+			-DALSOFT_REQUIRE_ALSA=ON
+			-DALSOFT_REQUIRE_OSS=ON
+			-DALSOFT_REQUIRE_PULSEAUDIO=ON
+		)
 	endif()
 
 	ExternalProject_Add(external_openal

intern/cycles/render/osl.cpp

@@ -66,6 +66,10 @@ OSLShaderManager::~OSLShaderManager()
 {
 	shading_system_free();
 	texture_system_free();
+}
+
+void OSLShaderManager::free_memory()
+{
 #ifdef OSL_HAS_BLENDER_CLEANUP_FIX
 	/* There is a problem with llvm+osl: The order global destructors across
 	 * different compilation units run cannot be guaranteed, on windows this means

intern/cycles/render/osl.h

@@ -70,6 +70,8 @@ public:
 	OSLShaderManager();
 	~OSLShaderManager();
 
+	static void free_memory();
+
 	void reset(Scene *scene);
 
 	bool use_osl() { return true; }

intern/cycles/render/shader.cpp

@@ -693,6 +693,10 @@ void ShaderManager::get_requested_features(Scene *scene,
 void ShaderManager::free_memory()
 {
 	beckmann_table.free_memory();
+
+#ifdef WITH_OSL
+	OSLShaderManager::free_memory();
+#endif
 }
 
 float ShaderManager::linear_rgb_to_gray(float3 c)