bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Revert "Image Editor: Make Rendering of Pure Emissive Colors Optional"

Browse Source 
This reverts commit f492c8d488b7eb2166ca894e10a8128a1678a885.
This commit is contained in:
Jeroen Bakker 2020-09-15 14:33:22 +02:00
parent 78ea6302f1
commit 8f7ab26935
6 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/startup/bl_ui/space_image.py
View File

@ -989,7 +989,6 @@ class IMAGE_PT_view_display(Panel):
row = col.row()
row.active = ima.source != 'TILED'
row.prop(sima, "show_repeat", text="Repeat Image")
col.prop(sima, "show_pure_emissive_colors")
if show_uvedit:
col.prop(uvedit, "show_pixel_coords", text="Pixel Coordinates")

3
source/blender/blenloader/intern/versioning_280.c
View File

@ -3396,9 +3396,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
switch (sl->spacetype) {
case SPACE_IMAGE: {
const int si_flag_unused_3 = (1 << 3);
SpaceImage *sima = (SpaceImage *)sl;
sima->flag &= ~(SI_FLAG_UNUSED_0 | SI_FLAG_UNUSED_1 | si_flag_unused_3 |
sima->flag &= ~(SI_FLAG_UNUSED_0 | SI_FLAG_UNUSED_1 | SI_FLAG_UNUSED_3 |
SI_FLAG_UNUSED_6 | SI_FLAG_UNUSED_7 | SI_FLAG_UNUSED_8 |
SI_FLAG_UNUSED_17 | SI_FLAG_UNUSED_18 | SI_FLAG_UNUSED_23 |
SI_FLAG_UNUSED_24);

3
source/blender/draw/engines/image/image_engine.c
View File

@ -43,7 +43,6 @@
#define SIMA_DRAW_FLAG_SHUFFLING (1 << 2)
#define SIMA_DRAW_FLAG_DEPTH (1 << 3)
#define SIMA_DRAW_FLAG_DO_REPEAT (1 << 4)
#define SIMA_DRAW_FLAG_PURE_EMISSIVE (1 << 5)
static void image_cache_image_add(DRWShadingGroup *grp, Image *image)
{
@ -143,7 +142,6 @@ static void image_cache_image(IMAGE_Data *vedata, Image *image, ImageUser *iuser
const bool is_tiled_texture = tex_tile_data != NULL;
const bool do_repeat = (!is_tiled_texture) && ((sima->flag & SI_DRAW_TILE) != 0);
const bool is_zoom_out = sima->zoom < 1.0f;
const bool show_pure_emissive_colors = (sima->flag & SI_SHOW_PURE_EMISSIVE) != 0;
/* use interpolation filtering when zooming out */
eGPUSamplerState state = 0;
@ -151,7 +149,6 @@ static void image_cache_image(IMAGE_Data *vedata, Image *image, ImageUser *iuser
int draw_flags = 0;
SET_FLAG_FROM_TEST(draw_flags, do_repeat, SIMA_DRAW_FLAG_DO_REPEAT);
SET_FLAG_FROM_TEST(draw_flags, show_pure_emissive_colors, SIMA_DRAW_FLAG_PURE_EMISSIVE);
if ((sima->flag & SI_USE_ALPHA) != 0) {
/* Show RGBA */

7
source/blender/draw/engines/image/shaders/engine_image_frag.glsl
View File

@ -6,7 +6,6 @@
#define SIMA_DRAW_FLAG_SHUFFLING (1 << 2)
#define SIMA_DRAW_FLAG_DEPTH (1 << 3)
#define SIMA_DRAW_FLAG_DO_REPEAT (1 << 4)
#define SIMA_DRAW_FLAG_PURE_EMISSIVE (1 << 5)
#ifdef TILED_IMAGE
uniform sampler2DArray imageTileArray;
@ -75,12 +74,6 @@ void main()
tex_color = texture(imageTexture, uvs_clamped);
#endif
if ((drawFlags & SIMA_DRAW_FLAG_PURE_EMISSIVE) == 0) {
if (imgPremultiplied && tex_color.a == 0.0) {
tex_color.rgb = vec3(0.0);
}
}
if ((drawFlags & SIMA_DRAW_FLAG_APPLY_ALPHA) != 0) {
if (!imgPremultiplied) {
tex_color.rgb *= tex_color.a;

2
source/blender/makesdna/DNA_space_types.h
View File

@ -1131,7 +1131,7 @@ typedef enum eSpaceImage_Flag {
SI_FLAG_UNUSED_0 = (1 << 0), /* cleared */
SI_FLAG_UNUSED_1 = (1 << 1), /* cleared */
SI_CLIP_UV = (1 << 2),
SI_SHOW_PURE_EMISSIVE = (1 << 3),
SI_FLAG_UNUSED_3 = (1 << 3), /* cleared */
SI_NO_DRAWFACES = (1 << 4),
SI_DRAWSHADOW = (1 << 5),
SI_FLAG_UNUSED_6 = (1 << 6), /* cleared */

5
source/blender/makesrna/intern/rna_space.c
View File

@ -4571,11 +4571,6 @@ static void rna_def_space_image(BlenderRNA *brna)
RNA_def_property_update(
prop, NC_SPACE | ND_SPACE_IMAGE, "rna_SpaceImageEditor_show_stereo_update");
prop = RNA_def_property(srna, "show_pure_emissive_colors", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_SHOW_PURE_EMISSIVE);
RNA_def_property_ui_text(prop, "Show Pure Emissive", "Display the image with pure emissive colors");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL);
/* uv */
prop = RNA_def_property(srna, "uv_editor", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NEVER_NULL);