2011-02-23 10:52:22 +00:00
|
|
|
/*
|
2009-07-24 15:27:59 +00:00
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
2012-03-18 09:27:36 +00:00
|
|
|
* of the License, or (at your option) any later version.
|
2009-07-24 15:27:59 +00:00
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
2010-02-12 13:34:04 +00:00
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2009-07-24 15:27:59 +00:00
|
|
|
*
|
|
|
|
|
* The Original Code is Copyright (C) 2009 Blender Foundation.
|
|
|
|
|
* All rights reserved.
|
|
|
|
|
*/
|
|
|
|
|
|
2019-02-18 08:08:12 +11:00
|
|
|
/** \file
|
|
|
|
|
* \ingroup RNA
|
2011-02-27 20:20:01 +00:00
|
|
|
*/
|
|
|
|
|
|
2009-07-24 15:27:59 +00:00
|
|
|
#include <stdio.h>
|
2020-03-19 09:33:03 +01:00
|
|
|
#include <stdlib.h>
|
2009-07-24 15:27:59 +00:00
|
|
|
#include <string.h>
|
|
|
|
|
#include <time.h>
|
|
|
|
|
|
2011-09-18 11:47:17 +00:00
|
|
|
#include "DNA_packedFile_types.h"
|
2009-07-24 15:27:59 +00:00
|
|
|
|
2014-02-26 10:58:14 +11:00
|
|
|
#include "BLI_path_util.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
#include "BLI_utildefines.h"
|
2013-03-07 02:44:55 +00:00
|
|
|
|
|
|
|
|
#include "RNA_define.h"
|
|
|
|
|
#include "RNA_enum_types.h"
|
|
|
|
|
|
2019-07-08 00:06:52 +10:00
|
|
|
#include "BKE_packedFile.h"
|
|
|
|
|
|
2012-09-24 22:39:45 +00:00
|
|
|
#include "rna_internal.h" /* own include */
|
|
|
|
|
|
2009-07-24 15:27:59 +00:00
|
|
|
#ifdef RNA_RUNTIME
|
|
|
|
|
|
|
|
|
|
# include "BKE_image.h"
|
2009-09-27 09:19:29 +00:00
|
|
|
# include "BKE_main.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
# include <errno.h>
|
2011-01-07 19:18:31 +00:00
|
|
|
|
Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.
This introduces two configurable color spaces:
- Input color space for images and movie clips. This space is used to convert
images/movies from color space in which file is saved to Blender's linear
space (for float images, byte images are not internally converted, only input
space is stored for such images and used later).
This setting could be found in image/clip data block settings.
- Display color space which defines space in which particular display is working.
This settings could be found in scene's Color Management panel.
When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.
This conversions are:
- View, which defines tone curve applying before display transformation.
These are different ways to view the image on the same display device.
For example it could be used to emulate film view on sRGB display.
- Exposure affects on image exposure before tone map is applied.
- Gamma is post-display gamma correction, could be used to match particular
display gamma.
- RGB curves are user-defined curves which are applying before display
transformation, could be used for different purposes.
All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.
This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).
Some technical notes:
- Image buffer's float buffer is now always in linear space, even if it was
created from 16bit byte images.
- Space of byte buffer is stored in image buffer's rect_colorspace property.
- Profile of image buffer was removed since it's not longer meaningful.
- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
to support other spaces, but it's quite large project which isn't so
much important.
- Legacy Color Management option disabled is emulated by using None display.
It could have some regressions, but there's no clear way to avoid them.
- If OpenColorIO is disabled on build time, it should make blender behaving
in the same way as previous release with color management enabled.
More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management
--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!
2012-09-15 10:05:07 +00:00
|
|
|
# include "IMB_colormanagement.h"
|
2020-03-19 09:33:03 +01:00
|
|
|
# include "IMB_imbuf.h"
|
2010-02-26 12:28:44 +00:00
|
|
|
|
2009-09-27 09:19:29 +00:00
|
|
|
# include "DNA_image_types.h"
|
|
|
|
|
# include "DNA_scene_types.h"
|
2009-07-24 15:27:59 +00:00
|
|
|
|
2009-08-19 09:52:13 +00:00
|
|
|
# include "MEM_guardedalloc.h"
|
|
|
|
|
|
2018-05-31 11:07:14 +02:00
|
|
|
static void rna_ImagePackedFile_save(ImagePackedFile *imapf, Main *bmain, ReportList *reports)
|
2015-10-21 02:26:23 +11:00
|
|
|
{
|
2019-07-07 23:57:35 +10:00
|
|
|
if (BKE_packedfile_write_to_file(
|
2018-06-05 15:10:33 +02:00
|
|
|
reports, BKE_main_blendfile_path(bmain), imapf->filepath, imapf->packedfile, 0) !=
|
|
|
|
|
RET_OK) {
|
2017-09-26 01:24:13 +13:00
|
|
|
BKE_reportf(reports, RPT_ERROR, "Could not save packed file to disk as '%s'", imapf->filepath);
|
2015-10-21 02:26:23 +11:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-11-17 09:45:45 +00:00
|
|
|
static void rna_Image_save_render(
|
|
|
|
|
Image *image, bContext *C, ReportList *reports, const char *path, Scene *scene)
|
2010-01-06 21:38:26 +00:00
|
|
|
{
|
|
|
|
|
ImBuf *ibuf;
|
2010-01-08 17:47:27 +00:00
|
|
|
|
|
|
|
|
if (scene == NULL) {
|
|
|
|
|
scene = CTX_data_scene(C);
|
|
|
|
|
}
|
2010-01-06 21:38:26 +00:00
|
|
|
|
|
|
|
|
if (scene) {
|
2015-03-14 12:10:09 +11:00
|
|
|
ImageUser iuser = {NULL};
|
2010-01-07 20:25:51 +00:00
|
|
|
void *lock;
|
2010-01-06 21:38:26 +00:00
|
|
|
|
2010-01-07 20:25:51 +00:00
|
|
|
iuser.scene = scene;
|
|
|
|
|
iuser.ok = 1;
|
|
|
|
|
|
|
|
|
|
ibuf = BKE_image_acquire_ibuf(image, &iuser, &lock);
|
2010-01-06 21:38:26 +00:00
|
|
|
|
2010-01-08 02:45:51 +00:00
|
|
|
if (ibuf == NULL) {
|
2012-10-21 14:02:30 +00:00
|
|
|
BKE_report(reports, RPT_ERROR, "Could not acquire buffer from image");
|
2010-01-08 02:45:51 +00:00
|
|
|
}
|
2010-10-27 22:13:05 +00:00
|
|
|
else {
|
2012-09-24 11:56:07 +00:00
|
|
|
ImBuf *write_ibuf;
|
Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.
This introduces two configurable color spaces:
- Input color space for images and movie clips. This space is used to convert
images/movies from color space in which file is saved to Blender's linear
space (for float images, byte images are not internally converted, only input
space is stored for such images and used later).
This setting could be found in image/clip data block settings.
- Display color space which defines space in which particular display is working.
This settings could be found in scene's Color Management panel.
When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.
This conversions are:
- View, which defines tone curve applying before display transformation.
These are different ways to view the image on the same display device.
For example it could be used to emulate film view on sRGB display.
- Exposure affects on image exposure before tone map is applied.
- Gamma is post-display gamma correction, could be used to match particular
display gamma.
- RGB curves are user-defined curves which are applying before display
transformation, could be used for different purposes.
All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.
This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).
Some technical notes:
- Image buffer's float buffer is now always in linear space, even if it was
created from 16bit byte images.
- Space of byte buffer is stored in image buffer's rect_colorspace property.
- Profile of image buffer was removed since it's not longer meaningful.
- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
to support other spaces, but it's quite large project which isn't so
much important.
- Legacy Color Management option disabled is emulated by using None display.
It could have some regressions, but there's no clear way to avoid them.
- If OpenColorIO is disabled on build time, it should make blender behaving
in the same way as previous release with color management enabled.
More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management
--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!
2012-09-15 10:05:07 +00:00
|
|
|
|
2013-09-05 17:13:43 +00:00
|
|
|
write_ibuf = IMB_colormanagement_imbuf_for_write(
|
2012-09-24 11:56:07 +00:00
|
|
|
ibuf, true, true, &scene->view_settings, &scene->display_settings, &scene->r.im_format);
|
Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.
This introduces two configurable color spaces:
- Input color space for images and movie clips. This space is used to convert
images/movies from color space in which file is saved to Blender's linear
space (for float images, byte images are not internally converted, only input
space is stored for such images and used later).
This setting could be found in image/clip data block settings.
- Display color space which defines space in which particular display is working.
This settings could be found in scene's Color Management panel.
When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.
This conversions are:
- View, which defines tone curve applying before display transformation.
These are different ways to view the image on the same display device.
For example it could be used to emulate film view on sRGB display.
- Exposure affects on image exposure before tone map is applied.
- Gamma is post-display gamma correction, could be used to match particular
display gamma.
- RGB curves are user-defined curves which are applying before display
transformation, could be used for different purposes.
All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.
This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).
Some technical notes:
- Image buffer's float buffer is now always in linear space, even if it was
created from 16bit byte images.
- Space of byte buffer is stored in image buffer's rect_colorspace property.
- Profile of image buffer was removed since it's not longer meaningful.
- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
to support other spaces, but it's quite large project which isn't so
much important.
- Legacy Color Management option disabled is emulated by using None display.
It could have some regressions, but there's no clear way to avoid them.
- If OpenColorIO is disabled on build time, it should make blender behaving
in the same way as previous release with color management enabled.
More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management
--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!
2012-09-15 10:05:07 +00:00
|
|
|
|
|
|
|
|
write_ibuf->planes = scene->r.im_format.planes;
|
|
|
|
|
write_ibuf->dither = scene->r.dither_intensity;
|
|
|
|
|
|
|
|
|
|
if (!BKE_imbuf_write(write_ibuf, path, &scene->r.im_format)) {
|
2016-01-11 12:32:29 +11:00
|
|
|
BKE_reportf(reports, RPT_ERROR, "Could not write image: %s, '%s'", strerror(errno), path);
|
2010-10-27 22:13:05 +00:00
|
|
|
}
|
2012-09-24 11:56:07 +00:00
|
|
|
|
2019-06-04 00:21:57 +10:00
|
|
|
if (write_ibuf != ibuf) {
|
2012-09-24 11:56:07 +00:00
|
|
|
IMB_freeImBuf(write_ibuf);
|
2019-06-04 00:21:57 +10:00
|
|
|
}
|
2010-01-06 21:38:26 +00:00
|
|
|
}
|
2010-08-13 09:47:14 +00:00
|
|
|
|
2012-11-15 15:59:58 +00:00
|
|
|
BKE_image_release_ibuf(image, ibuf, lock);
|
2012-03-24 06:24:53 +00:00
|
|
|
}
|
|
|
|
|
else {
|
2012-10-21 14:02:30 +00:00
|
|
|
BKE_report(reports, RPT_ERROR, "Scene not in context, could not get save parameters");
|
2010-01-06 21:38:26 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-08 02:20:55 +11:00
|
|
|
static void rna_Image_save(Image *image, Main *bmain, bContext *C, ReportList *reports)
|
2010-02-26 12:28:44 +00:00
|
|
|
{
|
2018-07-11 14:32:43 +02:00
|
|
|
void *lock;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-07-11 14:32:43 +02:00
|
|
|
ImBuf *ibuf = BKE_image_acquire_ibuf(image, NULL, &lock);
|
2012-03-05 23:30:41 +00:00
|
|
|
if (ibuf) {
|
2011-11-26 04:07:38 +00:00
|
|
|
char filename[FILE_MAX];
|
2020-06-23 09:54:14 +10:00
|
|
|
BLI_strncpy(filename, image->filepath, sizeof(filename));
|
2015-02-08 02:20:55 +11:00
|
|
|
BLI_path_abs(filename, ID_BLEND_PATH(bmain, &image->id));
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-10-21 02:26:23 +11:00
|
|
|
/* note, we purposefully ignore packed files here,
|
|
|
|
|
* developers need to explicitly write them via 'packed_files' */
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-10-21 02:26:23 +11:00
|
|
|
if (IMB_saveiff(ibuf, filename, ibuf->flags)) {
|
2012-03-05 23:30:41 +00:00
|
|
|
image->type = IMA_TYPE_IMAGE;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-06-04 00:21:57 +10:00
|
|
|
if (image->source == IMA_SRC_GENERATED) {
|
2012-03-05 23:30:41 +00:00
|
|
|
image->source = IMA_SRC_FILE;
|
2019-06-04 00:21:57 +10:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-12-05 11:53:37 +01:00
|
|
|
IMB_colormanagement_colorspace_from_ibuf_ftype(&image->colorspace_settings, ibuf);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-02-26 12:28:44 +00:00
|
|
|
ibuf->userflags &= ~IB_BITMAPDIRTY;
|
|
|
|
|
}
|
|
|
|
|
else {
|
2012-10-21 14:02:30 +00:00
|
|
|
BKE_reportf(reports,
|
|
|
|
|
RPT_ERROR,
|
|
|
|
|
"Image '%s' could not be saved to '%s'",
|
|
|
|
|
image->id.name + 2,
|
2020-06-23 09:54:14 +10:00
|
|
|
image->filepath);
|
2010-02-26 12:28:44 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
}
|
2010-02-26 12:28:44 +00:00
|
|
|
else {
|
2012-10-21 14:02:30 +00:00
|
|
|
BKE_reportf(reports, RPT_ERROR, "Image '%s' does not have any image data", image->id.name + 2);
|
2010-02-26 12:28:44 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2018-08-30 12:19:27 +02:00
|
|
|
BKE_image_release_ibuf(image, ibuf, lock);
|
2014-05-27 23:00:33 +03:00
|
|
|
WM_event_add_notifier(C, NC_IMAGE | NA_EDITED, image);
|
2010-02-26 12:28:44 +00:00
|
|
|
}
|
|
|
|
|
|
2016-02-20 14:52:36 +01:00
|
|
|
static void rna_Image_pack(
|
|
|
|
|
Image *image, Main *bmain, bContext *C, ReportList *reports, const char *data, int data_len)
|
2011-09-18 11:47:17 +00:00
|
|
|
{
|
2016-02-20 14:52:36 +01:00
|
|
|
BKE_image_free_packedfiles(image);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2016-02-20 14:52:36 +01:00
|
|
|
if (data) {
|
|
|
|
|
char *data_dup = MEM_mallocN(sizeof(*data_dup) * (size_t)data_len, __func__);
|
|
|
|
|
memcpy(data_dup, data, (size_t)data_len);
|
|
|
|
|
BKE_image_packfiles_from_mem(reports, image, data_dup, (size_t)data_len);
|
|
|
|
|
}
|
|
|
|
|
else if (BKE_image_is_dirty(image)) {
|
|
|
|
|
BKE_image_memorypack(image);
|
2011-09-18 11:47:17 +00:00
|
|
|
}
|
|
|
|
|
else {
|
2016-02-20 14:52:36 +01:00
|
|
|
BKE_image_packfiles(reports, image, ID_BLEND_PATH(bmain, &image->id));
|
2011-09-18 11:47:17 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-05-27 23:00:33 +03:00
|
|
|
WM_event_add_notifier(C, NC_IMAGE | NA_EDITED, image);
|
2011-09-18 11:47:17 +00:00
|
|
|
}
|
|
|
|
|
|
2018-05-31 11:07:14 +02:00
|
|
|
static void rna_Image_unpack(Image *image, Main *bmain, ReportList *reports, int method)
|
2011-09-18 11:47:17 +00:00
|
|
|
{
|
2015-05-22 23:28:41 +02:00
|
|
|
if (!BKE_image_has_packedfile(image)) {
|
2011-09-18 11:47:17 +00:00
|
|
|
BKE_report(reports, RPT_ERROR, "Image not packed");
|
|
|
|
|
}
|
Add support for tiled images and the UDIM naming scheme
This patch contains the work that I did during my week at the Code Quest - adding support for tiled images to Blender.
With this patch, images now contain a list of tiles. By default, this just contains one tile, but if the source type is set to Tiled, the user can add additional tiles. When acquiring an ImBuf, the tile to be loaded is specified in the ImageUser.
Therefore, code that is not yet aware of tiles will just access the default tile as usual.
The filenames of the additional tiles are derived from the original filename according to the UDIM naming scheme - the filename contains an index that is calculated as (1001 + 10*<y coordinate of the tile> + <x coordinate of the tile>), where the x coordinate never goes above 9.
Internally, the various tiles are stored in a cache just like sequences. When acquired for the first time, the code will try to load the corresponding file from disk. Alternatively, a new operator can be used to initialize the tile similar to the New Image operator.
The following features are supported so far:
- Automatic detection and loading of all tiles when opening the first tile (1001)
- Saving all tiles
- Adding and removing tiles
- Filling tiles with generated images
- Drawing all tiles in the Image Editor
- Viewing a tiled grid even if no image is selected
- Rendering tiled images in Eevee
- Rendering tiled images in Cycles (in SVM mode)
- Automatically skipping loading of unused tiles in Cycles
- 2D texture painting (also across tiles)
- 3D texture painting (also across tiles, only limitation: individual faces can not cross tile borders)
- Assigning custom labels to individual tiles (drawn in the Image Editor instead of the ID)
- Different resolutions between tiles
There still are some missing features that will be added later (see T72390):
- Workbench engine support
- Packing/Unpacking support
- Baking support
- Cycles OSL support
- many other Blender features that rely on images
Thanks to Brecht for the review and to all who tested the intermediate versions!
Differential Revision: https://developer.blender.org/D3509
2019-12-12 16:06:08 +01:00
|
|
|
else if (BKE_image_has_multiple_ibufs(image)) {
|
|
|
|
|
BKE_report(
|
|
|
|
|
reports, RPT_ERROR, "Unpacking movies, image sequences or tiled images not supported");
|
2011-09-18 11:47:17 +00:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
else {
|
2011-10-17 06:39:13 +00:00
|
|
|
/* reports its own error on failure */
|
2019-07-07 23:57:35 +10:00
|
|
|
BKE_packedfile_unpack_image(bmain, reports, image, method);
|
2011-09-18 11:47:17 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-11 15:40:37 +02:00
|
|
|
static void rna_Image_reload(Image *image, Main *bmain)
|
2010-03-06 12:02:27 +00:00
|
|
|
{
|
2018-06-11 15:40:37 +02:00
|
|
|
BKE_image_signal(bmain, image, NULL, IMA_SIGNAL_RELOAD);
|
2019-03-04 16:04:24 +01:00
|
|
|
WM_main_add_notifier(NC_IMAGE | NA_EDITED, image);
|
2010-03-06 12:02:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void rna_Image_update(Image *image, ReportList *reports)
|
|
|
|
|
{
|
2012-11-15 15:59:58 +00:00
|
|
|
ImBuf *ibuf = BKE_image_acquire_ibuf(image, NULL, NULL);
|
2010-03-06 12:02:27 +00:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
if (ibuf == NULL) {
|
2012-10-21 14:02:30 +00:00
|
|
|
BKE_reportf(reports, RPT_ERROR, "Image '%s' does not have any image data", image->id.name + 2);
|
2010-03-06 12:02:27 +00:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2019-06-04 00:21:57 +10:00
|
|
|
if (ibuf->rect) {
|
2012-10-15 07:47:38 +00:00
|
|
|
IMB_rect_from_float(ibuf);
|
2019-06-04 00:21:57 +10:00
|
|
|
}
|
2012-10-15 07:47:38 +00:00
|
|
|
|
|
|
|
|
ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID;
|
2012-11-15 15:59:58 +00:00
|
|
|
|
|
|
|
|
BKE_image_release_ibuf(image, ibuf, NULL);
|
2010-03-06 12:02:27 +00:00
|
|
|
}
|
|
|
|
|
|
2012-06-29 11:15:02 +00:00
|
|
|
static void rna_Image_scale(Image *image, ReportList *reports, int width, int height)
|
2012-05-17 15:26:11 +00:00
|
|
|
{
|
2012-06-29 10:52:37 +00:00
|
|
|
if (!BKE_image_scale(image, width, height)) {
|
2012-10-21 14:02:30 +00:00
|
|
|
BKE_reportf(reports, RPT_ERROR, "Image '%s' does not have any image data", image->id.name + 2);
|
2012-06-29 10:52:37 +00:00
|
|
|
}
|
2012-05-17 15:26:11 +00:00
|
|
|
}
|
|
|
|
|
|
Fix T73133: UDIM texture count in Eevee is limited by OpenGL
Based on @fclem's suggestion in D6421, this commit implements support for
storing all tiles of a UDIM texture in a single 2D array texture on the GPU.
Previously, Eevee was binding one OpenGL texture per tile, quickly running
into hardware limits with nontrivial UDIM texture sets.
Workbench meanwhile had no UDIM support at all, as reusing the per-tile
approach would require splitting the mesh by tile as well as texture.
With this commit, both Workbench as well as Eevee now support huge numbers
of tiles, with the eventual limits being GPU memory and ultimately
GL_MAX_ARRAY_TEXTURE_LAYERS, which tends to be in the 1000s on modern GPUs.
Initially my plan was to have one array texture per unique size, but managing
the different textures and keeping everything consistent ended up being way
too complex.
Therefore, we now use a simpler version that allocates a texture that
is large enough to fit the largest tile and then packs all tiles into as many
layers as necessary.
As a result, each UDIM texture only binds two textures (one for the actual
images, one for metadata) regardless of how many tiles are used.
Note that this rolls back per-tile GPUTextures, meaning that we again have
per-Image GPUTextures like we did before the original UDIM commit,
but now with four instead of two types.
Reviewed By: fclem
Differential Revision: https://developer.blender.org/D6456
2020-01-14 00:33:21 +01:00
|
|
|
static int rna_Image_gl_load(Image *image, ReportList *reports, int frame)
|
2010-03-06 12:02:27 +00:00
|
|
|
{
|
Add support for tiled images and the UDIM naming scheme
This patch contains the work that I did during my week at the Code Quest - adding support for tiled images to Blender.
With this patch, images now contain a list of tiles. By default, this just contains one tile, but if the source type is set to Tiled, the user can add additional tiles. When acquiring an ImBuf, the tile to be loaded is specified in the ImageUser.
Therefore, code that is not yet aware of tiles will just access the default tile as usual.
The filenames of the additional tiles are derived from the original filename according to the UDIM naming scheme - the filename contains an index that is calculated as (1001 + 10*<y coordinate of the tile> + <x coordinate of the tile>), where the x coordinate never goes above 9.
Internally, the various tiles are stored in a cache just like sequences. When acquired for the first time, the code will try to load the corresponding file from disk. Alternatively, a new operator can be used to initialize the tile similar to the New Image operator.
The following features are supported so far:
- Automatic detection and loading of all tiles when opening the first tile (1001)
- Saving all tiles
- Adding and removing tiles
- Filling tiles with generated images
- Drawing all tiles in the Image Editor
- Viewing a tiled grid even if no image is selected
- Rendering tiled images in Eevee
- Rendering tiled images in Cycles (in SVM mode)
- Automatically skipping loading of unused tiles in Cycles
- 2D texture painting (also across tiles)
- 3D texture painting (also across tiles, only limitation: individual faces can not cross tile borders)
- Assigning custom labels to individual tiles (drawn in the Image Editor instead of the ID)
- Different resolutions between tiles
There still are some missing features that will be added later (see T72390):
- Workbench engine support
- Packing/Unpacking support
- Baking support
- Cycles OSL support
- many other Blender features that rely on images
Thanks to Brecht for the review and to all who tested the intermediate versions!
Differential Revision: https://developer.blender.org/D3509
2019-12-12 16:06:08 +01:00
|
|
|
ImageUser iuser;
|
|
|
|
|
BKE_imageuser_default(&iuser);
|
2014-01-11 21:25:20 +11:00
|
|
|
iuser.framenr = frame;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-07-29 18:13:19 +02:00
|
|
|
GPUTexture *tex = BKE_image_get_gpu_texture(image, &iuser, NULL);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2019-04-23 13:56:30 +02:00
|
|
|
if (tex == NULL) {
|
|
|
|
|
BKE_reportf(reports, RPT_ERROR, "Failed to load image texture '%s'", image->id.name + 2);
|
2020-09-19 14:32:41 +10:00
|
|
|
/* TODO(fclem): this error code makes no sense for vulkan. */
|
2020-07-26 20:17:01 +02:00
|
|
|
return 0x0502; /* GL_INVALID_OPERATION */
|
2010-03-06 12:02:27 +00:00
|
|
|
}
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2020-07-26 20:17:01 +02:00
|
|
|
return 0; /* GL_NO_ERROR */
|
2010-03-06 12:02:27 +00:00
|
|
|
}
|
|
|
|
|
|
Fix T73133: UDIM texture count in Eevee is limited by OpenGL
Based on @fclem's suggestion in D6421, this commit implements support for
storing all tiles of a UDIM texture in a single 2D array texture on the GPU.
Previously, Eevee was binding one OpenGL texture per tile, quickly running
into hardware limits with nontrivial UDIM texture sets.
Workbench meanwhile had no UDIM support at all, as reusing the per-tile
approach would require splitting the mesh by tile as well as texture.
With this commit, both Workbench as well as Eevee now support huge numbers
of tiles, with the eventual limits being GPU memory and ultimately
GL_MAX_ARRAY_TEXTURE_LAYERS, which tends to be in the 1000s on modern GPUs.
Initially my plan was to have one array texture per unique size, but managing
the different textures and keeping everything consistent ended up being way
too complex.
Therefore, we now use a simpler version that allocates a texture that
is large enough to fit the largest tile and then packs all tiles into as many
layers as necessary.
As a result, each UDIM texture only binds two textures (one for the actual
images, one for metadata) regardless of how many tiles are used.
Note that this rolls back per-tile GPUTextures, meaning that we again have
per-Image GPUTextures like we did before the original UDIM commit,
but now with four instead of two types.
Reviewed By: fclem
Differential Revision: https://developer.blender.org/D6456
2020-01-14 00:33:21 +01:00
|
|
|
static int rna_Image_gl_touch(Image *image, ReportList *reports, int frame)
|
2012-05-23 20:19:40 +00:00
|
|
|
{
|
2020-07-26 20:17:01 +02:00
|
|
|
int error = 0; /* GL_NO_ERROR */
|
2012-05-23 20:19:40 +00:00
|
|
|
|
|
|
|
|
BKE_image_tag_time(image);
|
|
|
|
|
|
2020-07-29 17:12:02 +02:00
|
|
|
if (image->gputexture[TEXTARGET_2D][0] == NULL) {
|
Fix T73133: UDIM texture count in Eevee is limited by OpenGL
Based on @fclem's suggestion in D6421, this commit implements support for
storing all tiles of a UDIM texture in a single 2D array texture on the GPU.
Previously, Eevee was binding one OpenGL texture per tile, quickly running
into hardware limits with nontrivial UDIM texture sets.
Workbench meanwhile had no UDIM support at all, as reusing the per-tile
approach would require splitting the mesh by tile as well as texture.
With this commit, both Workbench as well as Eevee now support huge numbers
of tiles, with the eventual limits being GPU memory and ultimately
GL_MAX_ARRAY_TEXTURE_LAYERS, which tends to be in the 1000s on modern GPUs.
Initially my plan was to have one array texture per unique size, but managing
the different textures and keeping everything consistent ended up being way
too complex.
Therefore, we now use a simpler version that allocates a texture that
is large enough to fit the largest tile and then packs all tiles into as many
layers as necessary.
As a result, each UDIM texture only binds two textures (one for the actual
images, one for metadata) regardless of how many tiles are used.
Note that this rolls back per-tile GPUTextures, meaning that we again have
per-Image GPUTextures like we did before the original UDIM commit,
but now with four instead of two types.
Reviewed By: fclem
Differential Revision: https://developer.blender.org/D6456
2020-01-14 00:33:21 +01:00
|
|
|
error = rna_Image_gl_load(image, reports, frame);
|
2019-06-04 00:21:57 +10:00
|
|
|
}
|
2012-05-23 20:19:40 +00:00
|
|
|
|
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
|
2010-03-06 12:02:27 +00:00
|
|
|
static void rna_Image_gl_free(Image *image)
|
|
|
|
|
{
|
2020-07-29 18:13:19 +02:00
|
|
|
BKE_image_free_gputextures(image);
|
2010-03-06 12:02:27 +00:00
|
|
|
|
|
|
|
|
/* remove the nocollect flag, image is available for garbage collection again */
|
|
|
|
|
image->flag &= ~IMA_NOCOLLECT;
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-26 10:58:14 +11:00
|
|
|
static void rna_Image_filepath_from_user(Image *image, ImageUser *image_user, char *filepath)
|
|
|
|
|
{
|
|
|
|
|
BKE_image_user_file_path(image_user, image, filepath);
|
|
|
|
|
}
|
|
|
|
|
|
2015-04-02 19:24:14 +05:00
|
|
|
static void rna_Image_buffers_free(Image *image)
|
|
|
|
|
{
|
2017-08-22 15:50:05 +02:00
|
|
|
BKE_image_free_buffers_ex(image, true);
|
2015-04-02 19:24:14 +05:00
|
|
|
}
|
|
|
|
|
|
2009-07-24 15:27:59 +00:00
|
|
|
#else
|
|
|
|
|
|
2015-10-21 02:26:23 +11:00
|
|
|
void RNA_api_image_packed_file(StructRNA *srna)
|
|
|
|
|
{
|
|
|
|
|
FunctionRNA *func;
|
|
|
|
|
|
|
|
|
|
func = RNA_def_function(srna, "save", "rna_ImagePackedFile_save");
|
|
|
|
|
RNA_def_function_ui_description(func, "Save the packed file to its filepath");
|
2018-05-31 11:07:14 +02:00
|
|
|
RNA_def_function_flag(func, FUNC_USE_MAIN | FUNC_USE_REPORTS);
|
2015-10-21 02:26:23 +11:00
|
|
|
}
|
|
|
|
|
|
2009-07-24 15:27:59 +00:00
|
|
|
void RNA_api_image(StructRNA *srna)
|
|
|
|
|
{
|
|
|
|
|
FunctionRNA *func;
|
|
|
|
|
PropertyRNA *parm;
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
func = RNA_def_function(srna, "save_render", "rna_Image_save_render");
|
2010-03-06 12:02:27 +00:00
|
|
|
RNA_def_function_ui_description(func,
|
|
|
|
|
"Save image to a specific path using a scenes render settings");
|
2012-05-12 11:01:29 +00:00
|
|
|
RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
|
2014-01-16 21:43:22 +11:00
|
|
|
parm = RNA_def_string_file_path(func, "filepath", NULL, 0, "", "Save path");
|
Refactor RNA property: split flags in property flags, parameter flags, and internal flags.
This gives us 9 flags available again for properties (we had none anymore),
and also makes things slightly cleaner.
To simplify (and make more clear the differences between mere properties
and function parameters), also added RNA_def_parameter_flags function (and
its clear counterpart), to be used instead of RNA_def_property_flag for
function parameters.
This patch is also a big cleanup (some RNA function definitions were
still using 'prop' PropertyRNA pointer, etc.).
And yes, am aware this will be annoying for all branches, but we really need
to get new flags available for properties (will need at least one for override, etc.).
Reviewers: sergey, Severin
Subscribers: dfelinto, brecht
Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
|
|
|
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
|
2011-01-10 03:58:07 +00:00
|
|
|
RNA_def_pointer(func, "scene", "Scene", "", "Scene to take image parameters from");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
func = RNA_def_function(srna, "save", "rna_Image_save");
|
2010-03-06 12:02:27 +00:00
|
|
|
RNA_def_function_ui_description(func, "Save image to its source path");
|
2015-02-08 02:20:55 +11:00
|
|
|
RNA_def_function_flag(func, FUNC_USE_MAIN | FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
func = RNA_def_function(srna, "pack", "rna_Image_pack");
|
2011-09-19 13:23:58 +00:00
|
|
|
RNA_def_function_ui_description(func, "Pack an image as embedded data into the .blend file");
|
2015-02-08 02:20:55 +11:00
|
|
|
RNA_def_function_flag(func, FUNC_USE_MAIN | FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
|
2015-02-04 14:46:22 +01:00
|
|
|
parm = RNA_def_property(func, "data", PROP_STRING, PROP_BYTESTRING);
|
|
|
|
|
RNA_def_property_ui_text(parm, "data", "Raw data (bytes, exact content of the embedded file)");
|
|
|
|
|
RNA_def_int(func,
|
|
|
|
|
"data_len",
|
|
|
|
|
0,
|
|
|
|
|
0,
|
|
|
|
|
INT_MAX,
|
|
|
|
|
"data_len",
|
|
|
|
|
"length of given data (mandatory if data is provided)",
|
|
|
|
|
0,
|
|
|
|
|
INT_MAX);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
func = RNA_def_function(srna, "unpack", "rna_Image_unpack");
|
2011-09-18 11:47:17 +00:00
|
|
|
RNA_def_function_ui_description(func, "Save an image packed in the .blend file to disk");
|
2018-05-31 11:07:14 +02:00
|
|
|
RNA_def_function_flag(func, FUNC_USE_MAIN | FUNC_USE_REPORTS);
|
2015-11-23 13:49:52 +11:00
|
|
|
RNA_def_enum(
|
|
|
|
|
func, "method", rna_enum_unpack_method_items, PF_USE_LOCAL, "method", "How to unpack");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
func = RNA_def_function(srna, "reload", "rna_Image_reload");
|
2018-06-11 15:40:37 +02:00
|
|
|
RNA_def_function_flag(func, FUNC_USE_MAIN);
|
2010-03-06 12:02:27 +00:00
|
|
|
RNA_def_function_ui_description(func, "Reload the image from its source path");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
func = RNA_def_function(srna, "update", "rna_Image_update");
|
2020-12-24 13:11:22 -06:00
|
|
|
RNA_def_function_ui_description(func, "Update the display image from the floating-point buffer");
|
2010-02-26 12:28:44 +00:00
|
|
|
RNA_def_function_flag(func, FUNC_USE_REPORTS);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-05-17 15:26:11 +00:00
|
|
|
func = RNA_def_function(srna, "scale", "rna_Image_scale");
|
|
|
|
|
RNA_def_function_ui_description(func, "Scale the image in pixels");
|
2012-06-29 10:52:37 +00:00
|
|
|
RNA_def_function_flag(func, FUNC_USE_REPORTS);
|
2021-01-04 19:05:46 +11:00
|
|
|
parm = RNA_def_int(func, "width", 1, 1, INT_MAX, "", "Width", 1, INT_MAX);
|
Refactor RNA property: split flags in property flags, parameter flags, and internal flags.
This gives us 9 flags available again for properties (we had none anymore),
and also makes things slightly cleaner.
To simplify (and make more clear the differences between mere properties
and function parameters), also added RNA_def_parameter_flags function (and
its clear counterpart), to be used instead of RNA_def_property_flag for
function parameters.
This patch is also a big cleanup (some RNA function definitions were
still using 'prop' PropertyRNA pointer, etc.).
And yes, am aware this will be annoying for all branches, but we really need
to get new flags available for properties (will need at least one for override, etc.).
Reviewers: sergey, Severin
Subscribers: dfelinto, brecht
Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
|
|
|
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
|
2021-01-04 19:05:46 +11:00
|
|
|
parm = RNA_def_int(func, "height", 1, 1, INT_MAX, "", "Height", 1, INT_MAX);
|
Refactor RNA property: split flags in property flags, parameter flags, and internal flags.
This gives us 9 flags available again for properties (we had none anymore),
and also makes things slightly cleaner.
To simplify (and make more clear the differences between mere properties
and function parameters), also added RNA_def_parameter_flags function (and
its clear counterpart), to be used instead of RNA_def_property_flag for
function parameters.
This patch is also a big cleanup (some RNA function definitions were
still using 'prop' PropertyRNA pointer, etc.).
And yes, am aware this will be annoying for all branches, but we really need
to get new flags available for properties (will need at least one for override, etc.).
Reviewers: sergey, Severin
Subscribers: dfelinto, brecht
Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
|
|
|
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-05-23 20:19:40 +00:00
|
|
|
func = RNA_def_function(srna, "gl_touch", "rna_Image_gl_touch");
|
|
|
|
|
RNA_def_function_ui_description(
|
|
|
|
|
func, "Delay the image from being cleaned from the cache due inactivity");
|
|
|
|
|
RNA_def_function_flag(func, FUNC_USE_REPORTS);
|
2014-01-11 21:25:20 +11:00
|
|
|
RNA_def_int(
|
|
|
|
|
func, "frame", 0, 0, INT_MAX, "Frame", "Frame of image sequence or movie", 0, INT_MAX);
|
2012-05-23 20:19:40 +00:00
|
|
|
/* return value */
|
|
|
|
|
parm = RNA_def_int(
|
|
|
|
|
func, "error", 0, -INT_MAX, INT_MAX, "Error", "OpenGL error value", -INT_MAX, INT_MAX);
|
|
|
|
|
RNA_def_function_return(func, parm);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
func = RNA_def_function(srna, "gl_load", "rna_Image_gl_load");
|
2019-04-23 13:56:30 +02:00
|
|
|
RNA_def_function_ui_description(
|
|
|
|
|
func,
|
|
|
|
|
"Load the image into an OpenGL texture. On success, image.bindcode will contain the "
|
|
|
|
|
"OpenGL texture bindcode. Colors read from the texture will be in scene linear color space "
|
2019-06-07 17:49:58 +02:00
|
|
|
"and have premultiplied or straight alpha matching the image alpha mode");
|
2010-03-06 12:02:27 +00:00
|
|
|
RNA_def_function_flag(func, FUNC_USE_REPORTS);
|
2014-01-11 21:25:20 +11:00
|
|
|
RNA_def_int(
|
|
|
|
|
func, "frame", 0, 0, INT_MAX, "Frame", "Frame of image sequence or movie", 0, INT_MAX);
|
2010-06-03 16:26:04 +00:00
|
|
|
/* return value */
|
2012-03-05 23:30:41 +00:00
|
|
|
parm = RNA_def_int(
|
|
|
|
|
func, "error", 0, -INT_MAX, INT_MAX, "Error", "OpenGL error value", -INT_MAX, INT_MAX);
|
2010-06-03 16:26:04 +00:00
|
|
|
RNA_def_function_return(func, parm);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2012-03-05 23:30:41 +00:00
|
|
|
func = RNA_def_function(srna, "gl_free", "rna_Image_gl_free");
|
2010-03-06 12:02:27 +00:00
|
|
|
RNA_def_function_ui_description(func, "Free the image from OpenGL graphics memory");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2014-02-26 10:58:14 +11:00
|
|
|
/* path to an frame specified by image user */
|
|
|
|
|
func = RNA_def_function(srna, "filepath_from_user", "rna_Image_filepath_from_user");
|
|
|
|
|
RNA_def_function_ui_description(
|
|
|
|
|
func,
|
|
|
|
|
"Return the absolute path to the filepath of an image frame specified by the image user");
|
|
|
|
|
RNA_def_pointer(
|
|
|
|
|
func, "image_user", "ImageUser", "", "Image user of the image to get filepath for");
|
|
|
|
|
parm = RNA_def_string_file_path(func,
|
|
|
|
|
"filepath",
|
|
|
|
|
NULL,
|
|
|
|
|
FILE_MAX,
|
|
|
|
|
"File Path",
|
|
|
|
|
"The resulting filepath from the image and its user");
|
Refactor RNA property: split flags in property flags, parameter flags, and internal flags.
This gives us 9 flags available again for properties (we had none anymore),
and also makes things slightly cleaner.
To simplify (and make more clear the differences between mere properties
and function parameters), also added RNA_def_parameter_flags function (and
its clear counterpart), to be used instead of RNA_def_property_flag for
function parameters.
This patch is also a big cleanup (some RNA function definitions were
still using 'prop' PropertyRNA pointer, etc.).
And yes, am aware this will be annoying for all branches, but we really need
to get new flags available for properties (will need at least one for override, etc.).
Reviewers: sergey, Severin
Subscribers: dfelinto, brecht
Differential Revision: https://developer.blender.org/D2400
2016-12-12 15:23:55 +01:00
|
|
|
RNA_def_parameter_flags(parm, PROP_THICK_WRAP, 0); /* needed for string return value */
|
2014-02-26 10:58:14 +11:00
|
|
|
RNA_def_function_output(func, parm);
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2015-04-02 19:24:14 +05:00
|
|
|
func = RNA_def_function(srna, "buffers_free", "rna_Image_buffers_free");
|
|
|
|
|
RNA_def_function_ui_description(func, "Free the image buffers from memory");
|
2019-04-17 06:17:24 +02:00
|
|
|
|
2010-03-06 12:02:27 +00:00
|
|
|
/* TODO, pack/unpack, maybe should be generic functions? */
|
2009-07-24 15:27:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|