[Bf-blender-cvs] [1be95bb] decklink: BGE: fix a bug in ImageRender.refresh(buffer): the scene was rendered twice.

Benoit Bolsee noreply at git.blender.org
Mon Oct 12 23:47:05 CEST 2015


Commit: 1be95bb0f43540e5189b9b1d2e60a6527027d504
Author: Benoit Bolsee
Date:   Mon Oct 12 23:44:17 2015 +0200
Branches: decklink
https://developer.blender.org/rB1be95bb0f43540e5189b9b1d2e60a6527027d504

BGE: fix a bug in ImageRender.refresh(buffer): the scene was rendered twice.

This bug had no visible effect other than consuming CPU time because of the
double render.

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

M	source/gameengine/VideoTexture/ImageRender.cpp
M	source/gameengine/VideoTexture/ImageRender.h

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

diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp
index 9db9a1a..3b0ab6c 100644
--- a/source/gameengine/VideoTexture/ImageRender.cpp
+++ b/source/gameengine/VideoTexture/ImageRender.cpp
@@ -149,18 +149,6 @@ void ImageRender::calcImage (unsigned int texId, double ts)
 	}
 }
 
-bool ImageRender::loadImage(unsigned int *buffer, unsigned int size)
-{
-	bool ret;
-	if (!Render())
-	{
-		return false;
-	}
-	ret = ImageViewport::loadImage(buffer, size);
-	m_canvas->EndFrame();
-	return ret;
-}
-
 bool ImageRender::Render()
 {
 	RAS_FrameFrustum frustrum;
diff --git a/source/gameengine/VideoTexture/ImageRender.h b/source/gameengine/VideoTexture/ImageRender.h
index 3e22654..7c49a89 100644
--- a/source/gameengine/VideoTexture/ImageRender.h
+++ b/source/gameengine/VideoTexture/ImageRender.h
@@ -100,9 +100,6 @@ protected:
 	/// render 3d scene to image
 	virtual void calcImage (unsigned int texId, double ts);
 
-	/// render 3d scene to user buffer
-	virtual bool loadImage(unsigned int *buffer, unsigned int size);
-
 	bool Render();
 	void SetupRenderFrame(KX_Scene *scene, KX_Camera* cam);
 	void RenderFrame(KX_Scene* scene, KX_Camera* cam);




More information about the Bf-blender-cvs mailing list