[Bf-blender-cvs] [4afd5db] master: Only annoy coders with warnings, not users.

Antony Riakiotakis noreply at git.blender.org
Wed Dec 3 19:50:01 CET 2014


Commit: 4afd5db47e1f0cb15080726d9a9df1ed1057b573
Author: Antony Riakiotakis
Date:   Wed Dec 3 19:49:48 2014 +0100
Branches: master
https://developer.blender.org/rB4afd5db47e1f0cb15080726d9a9df1ed1057b573

Only annoy coders with warnings, not users.

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

M	source/blender/gpu/intern/gpu_extensions.c

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

diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 036ea0d..0781337 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -749,7 +749,7 @@ void GPU_texture_bind(GPUTexture *tex, int number)
 	}
 
 	if (tex->fb) {
-		if (tex->fb->object == GG.currentfb) {
+		if (tex->fb->object == GG.currentfb && (G.debug & G_DEBUG)) {
 			fprintf(stderr, "Feedback loop warning!: Attempting to bind texture attached to current framebuffer!\n");
 		}
 	}
@@ -884,7 +884,7 @@ int GPU_framebuffer_texture_attach(GPUFrameBuffer *fb, GPUTexture *tex, int slot
 		return 0;
 	}
 
-	if (tex->number != -1) {
+	if (tex->number != -1 && (G.debug & G_DEBUG)) {
 		fprintf(stderr, "Feedback loop warning!: Attempting to attach texture to framebuffer while still bound to texture unit for drawing!");
 	}




More information about the Bf-blender-cvs mailing list