[Bf-blender-cvs] [6336b21] gooseberry: Merge branch 'master' into gooseberry

Campbell Barton noreply at git.blender.org
Fri Nov 28 16:33:42 CET 2014


Commit: 6336b215a9cb1a90b6aaa65f39033fc23cfe1591
Author: Campbell Barton
Date:   Fri Nov 28 16:26:44 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB6336b215a9cb1a90b6aaa65f39033fc23cfe1591

Merge branch 'master' into gooseberry

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



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

diff --cc source/blender/editors/render/render_opengl.c
index 7266f5e,1ebc7e8..d478671
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@@ -70,9 -68,7 +70,8 @@@
  
  #include "GPU_extensions.h"
  #include "GPU_glew.h"
 +#include "GPU_compositing.h"
  
- #include "wm_window.h"
  
  #include "render_intern.h"




More information about the Bf-blender-cvs mailing list