[Bf-blender-cvs] [12bb5bd] decklink: Merge remote-tracking branch 'origin/master' into decklink

[Benoit Bolsee]

Commit: 12bb5bdabf51eca1cc8fd236df2c4606b5e963aa
Author: Benoit Bolsee
Date:   Sat Feb 20 23:22:29 2016 +0100
Branches: decklink
https://developer.blender.org/rB12bb5bdabf51eca1cc8fd236df2c4606b5e963aa

Merge remote-tracking branch 'origin/master' into decklink

Conflicts:
	source/gameengine/Ketsji/KX_KetsjiEngine.cpp

===================================================================



===================================================================

diff --cc intern/CMakeLists.txt
index 1353af5,43e5b6b..b36ea3b
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@@ -83,8 -79,10 +83,12 @@@ if(WITH_OPENSUBDIV
  endif()
  
  # only windows needs utf16 converter
 +# gpudirect is a runtime interface to the nVidia's DVP driver, only for windows
  if(WIN32)
  	add_subdirectory(utfconv)
 +	add_subdirectory(gpudirect)
  endif()
+ 
+ if(WITH_OPENVDB)
+ 	add_subdirectory(openvdb)
+ endif()
diff --cc source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index 43cb62b,c8bfab0..d96459d
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@@ -773,10 -768,10 +772,10 @@@ bool KX_KetsjiEngine::NextFrame(
  		frames--;
  	}
  
- 	// Start logging time spend outside main loop
+ 	// Start logging time spent outside main loop
  	m_logger->StartLog(tc_outside, m_kxsystem->GetTimeInSeconds(), true);
  	
 -	return doRender;
 +	return doRender && m_doRender;
  }
  
  
diff --cc source/gameengine/VideoTexture/ImageRender.cpp
index 53af271,a374fbb..af0bebc
--- a/source/gameengine/VideoTexture/ImageRender.cpp
+++ b/source/gameengine/VideoTexture/ImageRender.cpp
@@@ -135,45 -121,30 +135,45 @@@ void ImageRender::setBackgroundFromScen
  
  
  // capture image from viewport
 -void ImageRender::calcImage (unsigned int texId, double ts)
 +void ImageRender::calcViewport (unsigned int texId, double ts, unsigned int format)
  {
 -	if (m_rasterizer->GetDrawingMode() != RAS_IRasterizer::KX_TEXTURED ||   // no need for texture
 -	        m_camera->GetViewport() ||        // camera must be inactive
 -	        m_camera == m_scene->GetActiveCamera())
 +	// render the scene from the camera
 +	if (!m_done)
  	{
 -		// no need to compute texture in non texture rendering
 -		m_avail = false;
 -		return;
 +		if (!Render())
 +		{
 +			return;
 +		}
 +	}
 +	else if (m_offscreen)
 +	{
 +		m_offscreen->ofs->Bind(RAS_IOffScreen::RAS_OFS_BIND_READ);
 +	}
 +	// wait until all render operations are completed
 +	WaitSync();
 +	// get image from viewport (or FBO)
 +	ImageViewport::calcViewport(texId, ts, format);
 +	if (m_offscreen)
 +	{
 +		m_offscreen->ofs->Unbind();
  	}
 -	// render the scene from the camera
 -	Render();
 -	// get image from viewport
 -	ImageViewport::calcImage(texId, ts);
 -	// restore OpenGL state
 -	m_canvas->EndFrame();
  }
  
 -void ImageRender::Render()
 +bool ImageRender::Render()
  {
- 	RAS_FrameFrustum frustrum;
+ 	RAS_FrameFrustum frustum;
  
 -	if (!m_render)
 -		return;
 +	if (!m_render ||
 +	    m_rasterizer->GetDrawingMode() != RAS_IRasterizer::KX_TEXTURED ||   // no need for texture
 +        m_camera->GetViewport() ||        // camera must be inactive
 +        m_camera == m_scene->GetActiveCamera())
 +	{
 +		// no need to compute texture in non texture rendering
 +		return false;
 +	}
 +
 +	if (!m_scene->IsShadowDone())
 +		m_engine->RenderShadowBuffers(m_scene);
  
  	if (m_mirror)
  	{