[Bf-blender-cvs] [8f88982] framebuffer: Merge remote-tracking branch 'origin/master' into framebuffer

[Dalai Felinto]

Commit: 8f88982a6cd1662dad12fb4707006168174476b9
Author: Dalai Felinto
Date:   Thu Oct 15 10:58:02 2015 -0300
Branches: framebuffer
https://developer.blender.org/rB8f88982a6cd1662dad12fb4707006168174476b9

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

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



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

diff --cc source/blender/gpu/GPU_extensions.h
index b4aad45,2dadd38..bdceb25
--- a/source/blender/gpu/GPU_extensions.h
+++ b/source/blender/gpu/GPU_extensions.h
@@@ -180,10 -181,9 +182,10 @@@ void GPU_framebuffer_blur(GPUFrameBuffe
   * - wrapper around framebuffer and texture for simple offscreen drawing
   * - changes size if graphics card can't support it */
  
- GPUOffScreen *GPU_offscreen_create(int width, int height, char err_out[256]);
+ GPUOffScreen *GPU_offscreen_create(int width, int height, int samples, char err_out[256]);
  void GPU_offscreen_free(GPUOffScreen *ofs);
  void GPU_offscreen_bind(GPUOffScreen *ofs, bool save);
 +void GPU_offscreen_draw(GPUOffScreen *ofs, struct bContext *C, float projection_matrix[4][4], float modelview_matrix[4][4]);
  void GPU_offscreen_unbind(GPUOffScreen *ofs, bool restore);
  void GPU_offscreen_read_pixels(GPUOffScreen *ofs, int type, void *pixels);
  int GPU_offscreen_width(const GPUOffScreen *ofs);