[Bf-blender-cvs] [9c0c3e6] framebuffer: Remove ofs->framebuffer_object (no real need for it at the moment, we can readd later if someone needs it)

[Dalai Felinto]

Commit: 9c0c3e6b4e8fb3741af44b59274f85e3c6ace7e3
Author: Dalai Felinto
Date:   Mon Oct 19 16:53:11 2015 -0200
Branches: framebuffer
https://developer.blender.org/rB9c0c3e6b4e8fb3741af44b59274f85e3c6ace7e3

Remove ofs->framebuffer_object (no real need for it at the moment, we can readd 
later if someone needs it)

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

M       source/blender/gpu/GPU_extensions.h
M       source/blender/gpu/intern/gpu_extensions.c
M       source/blender/python/intern/gpu_offscreen.c

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

diff --git a/source/blender/gpu/GPU_extensions.h 
b/source/blender/gpu/GPU_extensions.h
index 5e80f45..62d8b85 100644
--- a/source/blender/gpu/GPU_extensions.h
+++ b/source/blender/gpu/GPU_extensions.h
@@ -188,7 +188,6 @@ 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);
 int GPU_offscreen_height(const GPUOffScreen *ofs);
-int GPU_offscreen_fb_object(const GPUOffScreen *ofs);
 int GPU_offscreen_color_object(const GPUOffScreen *ofs);
 
 /* Builtin/Non-generated shaders */
diff --git a/source/blender/gpu/intern/gpu_extensions.c 
b/source/blender/gpu/intern/gpu_extensions.c
index 86f4a2d..c42770e 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -1613,11 +1613,6 @@ int GPU_offscreen_height(const GPUOffScreen *ofs)
        return ofs->color->h_orig;
 }
 
-int GPU_offscreen_fb_object(const GPUOffScreen *ofs)
-{
-       return ofs->fb->object;
-}
-
 int GPU_offscreen_color_object(const GPUOffScreen *ofs)
 {
        return ofs->color->bindcode;
diff --git a/source/blender/python/intern/gpu_offscreen.c 
b/source/blender/python/intern/gpu_offscreen.c
index 291fda5..ced89f4 100644
--- a/source/blender/python/intern/gpu_offscreen.c
+++ b/source/blender/python/intern/gpu_offscreen.c
@@ -96,13 +96,6 @@ static PyObject *pygpu_offscreen_height_get(BPy_GPUOffScreen 
*self, void *UNUSED
        return PyLong_FromLong(GPU_offscreen_height(self->ofs));
 }
 
-PyDoc_STRVAR(pygpu_offscreen_framebuffer_object_doc, "Framebuffer 
object.\n\n:type: int");
-static PyObject *pygpu_offscreen_framebuffer_object_get(BPy_GPUOffScreen 
*self, void *UNUSED(type))
-{
-       BPY_GPU_OFFSCREEN_CHECK_OBJ(self);
-       return PyLong_FromLong(GPU_offscreen_fb_object(self->ofs));
-}
-
 PyDoc_STRVAR(pygpu_offscreen_color_object_doc, "Color object.\n\n:type: int");
 static PyObject *pygpu_offscreen_color_object_get(BPy_GPUOffScreen *self, void 
*UNUSED(type))
 {
@@ -280,7 +273,6 @@ static void BPy_GPUOffScreen__tp_dealloc(BPy_GPUOffScreen 
*self)
 
 static PyGetSetDef bpy_gpu_offscreen_getseters[] = {
        {(char *)"color_object", (getter)pygpu_offscreen_color_object_get, 
(setter)NULL, pygpu_offscreen_color_object_doc, NULL},
-       {(char *)"framebuffer_object", 
(getter)pygpu_offscreen_framebuffer_object_get, (setter)NULL, 
pygpu_offscreen_framebuffer_object_doc, NULL},
        {(char *)"width", (getter)pygpu_offscreen_width_get, (setter)NULL, 
pygpu_offscreen_width_doc, NULL},
        {(char *)"height", (getter)pygpu_offscreen_height_get, (setter)NULL, 
pygpu_offscreen_height_doc, NULL},
        {NULL, NULL, NULL, NULL, NULL}  /* Sentinel */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs