archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bake API: force opengl reload and mipmap recalc (fix T40055)

Browse Source
This commit is contained in:
Dalai Felinto
2014-05-06 19:12:31 -03:00
parent 2c4ea2a11e
commit d653c70ee6
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/editors/object/object_bake_api.c
View File

@@ -69,6 +69,7 @@
#include "ED_screen.h" #include "ED_screen.h"
#include "ED_uvedit.h" #include "ED_uvedit.h"
#include "GPU_draw.h"
#include "object_intern.h" #include "object_intern.h"
@@ -175,6 +176,12 @@ static bool write_internal_bake_pixels(
if (ibuf->rect_float) if (ibuf->rect_float)
ibuf->userflags |= IB_RECT_INVALID; ibuf->userflags |= IB_RECT_INVALID;
/* force mipmap recalc */
if (ibuf->mipmap[0]) {
ibuf->userflags |= IB_MIPMAP_INVALID;
imb_freemipmapImBuf(ibuf);
}
BKE_image_release_ibuf(image, ibuf, NULL); BKE_image_release_ibuf(image, ibuf, NULL);
if (mask_buffer) if (mask_buffer)
@@ -183,6 +190,18 @@ static bool write_internal_bake_pixels(
return true; return true;
} }
/* force OpenGL reload */
static void reset_images_gpu(BakeImages *bake_images)
{
int i;
for (i = 0; i < bake_images->size; i++) {
Image *ima = bake_images->data[i].image;
if (ima->ok == IMA_OK_LOADED) {
GPU_free_image(ima);
}
}
}
static bool write_external_bake_pixels( static bool write_external_bake_pixels(
const char *filepath, BakePixel pixel_array[], float *buffer, const char *filepath, BakePixel pixel_array[], float *buffer,
const int width, const int height, const int margin, const int width, const int height, const int margin,
@@ -793,6 +812,8 @@ static int bake(
} }
} }
if (is_save_internal)
reset_images_gpu(&bake_images);
cleanup: cleanup: