forked from bartvdbraak/blender
Fix [#20754] Histogram Not Updating, Showing Incorrect Levels, Colour Management on/off leads to Crash
Various internal fixes, also additional feature - can drag on the histogram to change scale (0 key to reset). Also fix [#20844] Color balance node (lift freeze)
This commit is contained in:
parent
b0989aac02
commit
9d0dbd707e
@ -143,9 +143,6 @@ struct RenderPass *BKE_image_multilayer_index(struct RenderResult *rr, struct Im
|
|||||||
struct RenderResult *BKE_image_acquire_renderresult(struct Scene *scene, struct Image *ima);
|
struct RenderResult *BKE_image_acquire_renderresult(struct Scene *scene, struct Image *ima);
|
||||||
void BKE_image_release_renderresult(struct Scene *scene, struct Image *ima);
|
void BKE_image_release_renderresult(struct Scene *scene, struct Image *ima);
|
||||||
|
|
||||||
/* frees all ibufs used by any image datablocks */
|
|
||||||
void BKE_image_free_image_ibufs(void);
|
|
||||||
|
|
||||||
/* goes over all textures that use images */
|
/* goes over all textures that use images */
|
||||||
void BKE_image_free_all_textures(void);
|
void BKE_image_free_all_textures(void);
|
||||||
|
|
||||||
|
@ -882,12 +882,12 @@ void curvemapping_table_RGBA(CurveMapping *cumap, float **array, int *size)
|
|||||||
|
|
||||||
DO_INLINE int get_bin_float(float f)
|
DO_INLINE int get_bin_float(float f)
|
||||||
{
|
{
|
||||||
int bin= (int)(f*511);
|
int bin= (int)(f*255);
|
||||||
|
|
||||||
/* note: clamp integer instead of float to avoid problems with NaN */
|
/* note: clamp integer instead of float to avoid problems with NaN */
|
||||||
CLAMP(bin, 0, 511);
|
CLAMP(bin, 0, 255);
|
||||||
|
|
||||||
//return (int) (((f + 0.25) / 1.5) * 512);
|
//return (int) (((f + 0.25) / 1.5) * 255);
|
||||||
|
|
||||||
return bin;
|
return bin;
|
||||||
}
|
}
|
||||||
@ -903,17 +903,20 @@ void histogram_update(Histogram *hist, ImBuf *ibuf)
|
|||||||
|
|
||||||
if (hist->ok == 1 ) return;
|
if (hist->ok == 1 ) return;
|
||||||
|
|
||||||
|
if (hist->xmax == 0.f) hist->xmax = 1.f;
|
||||||
|
if (hist->ymax == 0.f) hist->ymax = 1.f;
|
||||||
|
|
||||||
/* hmmmm */
|
/* hmmmm */
|
||||||
if (!(ELEM(ibuf->channels, 3, 4))) return;
|
if (!(ELEM(ibuf->channels, 3, 4))) return;
|
||||||
|
|
||||||
hist->channels = 3;
|
hist->channels = 3;
|
||||||
|
|
||||||
bin_r = MEM_callocN(512 * sizeof(unsigned int), "temp historgram bins");
|
bin_r = MEM_callocN(256 * sizeof(unsigned int), "temp historgram bins");
|
||||||
bin_g = MEM_callocN(512 * sizeof(unsigned int), "temp historgram bins");
|
bin_g = MEM_callocN(256 * sizeof(unsigned int), "temp historgram bins");
|
||||||
bin_b = MEM_callocN(512 * sizeof(unsigned int), "temp historgram bins");
|
bin_b = MEM_callocN(256 * sizeof(unsigned int), "temp historgram bins");
|
||||||
|
|
||||||
if (ibuf->rect_float) {
|
if (ibuf->rect_float) {
|
||||||
hist->x_resolution = 512;
|
hist->x_resolution = 256;
|
||||||
|
|
||||||
/* divide into bins */
|
/* divide into bins */
|
||||||
rf = ibuf->rect_float;
|
rf = ibuf->rect_float;
|
||||||
@ -942,7 +945,7 @@ void histogram_update(Histogram *hist, ImBuf *ibuf)
|
|||||||
|
|
||||||
/* convert to float */
|
/* convert to float */
|
||||||
n=0;
|
n=0;
|
||||||
for (x=0; x<512; x++) {
|
for (x=0; x<256; x++) {
|
||||||
if (bin_r[x] > n)
|
if (bin_r[x] > n)
|
||||||
n = bin_r[x];
|
n = bin_r[x];
|
||||||
if (bin_g[x] > n)
|
if (bin_g[x] > n)
|
||||||
@ -951,7 +954,7 @@ void histogram_update(Histogram *hist, ImBuf *ibuf)
|
|||||||
n = bin_b[x];
|
n = bin_b[x];
|
||||||
}
|
}
|
||||||
div = 1.f/(double)n;
|
div = 1.f/(double)n;
|
||||||
for (x=0; x<512; x++) {
|
for (x=0; x<256; x++) {
|
||||||
hist->data_r[x] = bin_r[x] * div;
|
hist->data_r[x] = bin_r[x] * div;
|
||||||
hist->data_g[x] = bin_g[x] * div;
|
hist->data_g[x] = bin_g[x] * div;
|
||||||
hist->data_b[x] = bin_b[x] * div;
|
hist->data_b[x] = bin_b[x] * div;
|
||||||
|
@ -725,17 +725,6 @@ void BKE_image_print_memlist(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* frees all ibufs used by any image datablocks */
|
|
||||||
void BKE_image_free_image_ibufs(void)
|
|
||||||
{
|
|
||||||
Image *ima;
|
|
||||||
|
|
||||||
for(ima= G.main->image.first; ima; ima= ima->id.next) {
|
|
||||||
image_free_buffers(ima);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void BKE_image_free_all_textures(void)
|
void BKE_image_free_all_textures(void)
|
||||||
{
|
{
|
||||||
Tex *tex;
|
Tex *tex;
|
||||||
|
@ -690,7 +690,7 @@ static void ui_draw_but_CHARTAB(uiBut *but)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
void ui_draw_but_HISTOGRAM(uiBut *but, uiWidgetColors *wcol, rcti *recti)
|
void ui_draw_but_HISTOGRAM(ARegion *ar, uiBut *but, uiWidgetColors *wcol, rcti *recti)
|
||||||
{
|
{
|
||||||
Histogram *hist = (Histogram *)but->poin;
|
Histogram *hist = (Histogram *)but->poin;
|
||||||
int res = hist->x_resolution;
|
int res = hist->x_resolution;
|
||||||
@ -699,6 +699,7 @@ void ui_draw_but_HISTOGRAM(uiBut *but, uiWidgetColors *wcol, rcti *recti)
|
|||||||
int rgb;
|
int rgb;
|
||||||
float w, h;
|
float w, h;
|
||||||
float alpha;
|
float alpha;
|
||||||
|
GLint scissor[4];
|
||||||
|
|
||||||
if (hist==NULL) { printf("hist is null \n"); return; }
|
if (hist==NULL) { printf("hist is null \n"); return; }
|
||||||
|
|
||||||
@ -709,6 +710,7 @@ void ui_draw_but_HISTOGRAM(uiBut *but, uiWidgetColors *wcol, rcti *recti)
|
|||||||
|
|
||||||
w = rect.xmax - rect.xmin;
|
w = rect.xmax - rect.xmin;
|
||||||
h = rect.ymax - rect.ymin;
|
h = rect.ymax - rect.ymin;
|
||||||
|
h *= hist->ymax;
|
||||||
|
|
||||||
glEnable(GL_BLEND);
|
glEnable(GL_BLEND);
|
||||||
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
|
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
|
||||||
@ -724,6 +726,10 @@ void ui_draw_but_HISTOGRAM(uiBut *but, uiWidgetColors *wcol, rcti *recti)
|
|||||||
fdrawline(rect.xmin+(i/4.f)*w, rect.ymin, rect.xmin+(i/4.f)*w, rect.ymax);
|
fdrawline(rect.xmin+(i/4.f)*w, rect.ymin, rect.xmin+(i/4.f)*w, rect.ymax);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* need scissor test, histogram can draw outside of boundary */
|
||||||
|
glGetIntegerv(GL_VIEWPORT, scissor);
|
||||||
|
glScissor(ar->winrct.xmin + (rect.xmin-1), ar->winrct.ymin+(rect.ymin-1), (rect.xmax+1)-(rect.xmin-1), (rect.ymax+1)-(rect.ymin-1));
|
||||||
|
|
||||||
for (rgb=0; rgb<3; rgb++) {
|
for (rgb=0; rgb<3; rgb++) {
|
||||||
float *data;
|
float *data;
|
||||||
|
|
||||||
@ -761,6 +767,9 @@ void ui_draw_but_HISTOGRAM(uiBut *but, uiWidgetColors *wcol, rcti *recti)
|
|||||||
glDisable(GL_LINE_SMOOTH);
|
glDisable(GL_LINE_SMOOTH);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* restore scissortest */
|
||||||
|
glScissor(scissor[0], scissor[1], scissor[2], scissor[3]);
|
||||||
|
|
||||||
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
|
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
|
||||||
glColor4f(0.f, 0.f, 0.f, 0.5f);
|
glColor4f(0.f, 0.f, 0.f, 0.5f);
|
||||||
uiSetRoundBox(15);
|
uiSetRoundBox(15);
|
||||||
|
@ -2979,6 +2979,12 @@ static int ui_numedit_but_HSVCIRCLE(uiBut *but, uiHandleButtonData *data, int mx
|
|||||||
ui_get_but_vectorf(but, rgb);
|
ui_get_but_vectorf(but, rgb);
|
||||||
rgb_to_hsv(rgb[0], rgb[1], rgb[2], hsv, hsv+1, hsv+2);
|
rgb_to_hsv(rgb[0], rgb[1], rgb[2], hsv, hsv+1, hsv+2);
|
||||||
|
|
||||||
|
/* exception, when using color wheel in 'locked' value state:
|
||||||
|
* allow choosing a hue for black values, by giving a tiny increment */
|
||||||
|
if (but->a2 == 1) { // lock
|
||||||
|
if (hsv[2] == 0.f) hsv[2] = 0.0001f;
|
||||||
|
}
|
||||||
|
|
||||||
ui_hsvcircle_vals_from_pos(hsv, hsv+1, &rect, (float)mx, (float)my);
|
ui_hsvcircle_vals_from_pos(hsv, hsv+1, &rect, (float)mx, (float)my);
|
||||||
|
|
||||||
hsv_to_rgb(hsv[0], hsv[1], hsv[2], rgb, rgb+1, rgb+2);
|
hsv_to_rgb(hsv[0], hsv[1], hsv[2], rgb, rgb+1, rgb+2);
|
||||||
@ -3412,6 +3418,81 @@ static int ui_do_but_CURVE(bContext *C, uiBlock *block, uiBut *but, uiHandleButt
|
|||||||
return WM_UI_HANDLER_CONTINUE;
|
return WM_UI_HANDLER_CONTINUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int ui_numedit_but_HISTOGRAM(uiBut *but, uiHandleButtonData *data, int mx, int my)
|
||||||
|
{
|
||||||
|
Histogram *hist = (Histogram *)but->poin;
|
||||||
|
rcti rect;
|
||||||
|
int changed= 1;
|
||||||
|
float dx, dy, yfac=1.f;
|
||||||
|
|
||||||
|
rect.xmin= but->x1; rect.xmax= but->x2;
|
||||||
|
rect.ymin= but->y1; rect.ymax= but->y2;
|
||||||
|
|
||||||
|
dx = mx - data->draglastx;
|
||||||
|
dy = my - data->draglasty;
|
||||||
|
|
||||||
|
yfac = MIN2(powf(hist->ymax, 2.f), 1.f) * 0.5;
|
||||||
|
hist->ymax += dy * yfac;
|
||||||
|
|
||||||
|
CLAMP(hist->ymax, 1.f, 100.f);
|
||||||
|
|
||||||
|
data->draglastx= mx;
|
||||||
|
data->draglasty= my;
|
||||||
|
|
||||||
|
return changed;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int ui_do_but_HISTOGRAM(bContext *C, uiBlock *block, uiBut *but, uiHandleButtonData *data, wmEvent *event)
|
||||||
|
{
|
||||||
|
int mx, my;
|
||||||
|
|
||||||
|
mx= event->x;
|
||||||
|
my= event->y;
|
||||||
|
ui_window_to_block(data->region, block, &mx, &my);
|
||||||
|
|
||||||
|
if(data->state == BUTTON_STATE_HIGHLIGHT) {
|
||||||
|
if(event->type==LEFTMOUSE && event->val==KM_PRESS) {
|
||||||
|
data->dragstartx= mx;
|
||||||
|
data->dragstarty= my;
|
||||||
|
data->draglastx= mx;
|
||||||
|
data->draglasty= my;
|
||||||
|
button_activate_state(C, but, BUTTON_STATE_NUM_EDITING);
|
||||||
|
|
||||||
|
/* also do drag the first time */
|
||||||
|
if(ui_numedit_but_HISTOGRAM(but, data, mx, my))
|
||||||
|
ui_numedit_apply(C, block, but, data);
|
||||||
|
|
||||||
|
return WM_UI_HANDLER_BREAK;
|
||||||
|
}
|
||||||
|
else if (event->type == ZEROKEY && event->val == KM_PRESS) {
|
||||||
|
Histogram *hist = (Histogram *)but->poin;
|
||||||
|
hist->ymax = 1.f;
|
||||||
|
|
||||||
|
button_activate_state(C, but, BUTTON_STATE_EXIT);
|
||||||
|
return WM_UI_HANDLER_BREAK;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(data->state == BUTTON_STATE_NUM_EDITING) {
|
||||||
|
if(event->type == ESCKEY) {
|
||||||
|
data->cancel= 1;
|
||||||
|
data->escapecancel= 1;
|
||||||
|
button_activate_state(C, but, BUTTON_STATE_EXIT);
|
||||||
|
}
|
||||||
|
else if(event->type == MOUSEMOVE) {
|
||||||
|
if(mx!=data->draglastx || my!=data->draglasty) {
|
||||||
|
if(ui_numedit_but_HISTOGRAM(but, data, mx, my))
|
||||||
|
ui_numedit_apply(C, block, but, data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(event->type==LEFTMOUSE && event->val!=KM_PRESS) {
|
||||||
|
button_activate_state(C, but, BUTTON_STATE_EXIT);
|
||||||
|
}
|
||||||
|
return WM_UI_HANDLER_BREAK;
|
||||||
|
}
|
||||||
|
|
||||||
|
return WM_UI_HANDLER_CONTINUE;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef INTERNATIONAL
|
#ifdef INTERNATIONAL
|
||||||
static int ui_do_but_CHARTAB(bContext *C, uiBlock *block, uiBut *but, uiHandleButtonData *data, wmEvent *event)
|
static int ui_do_but_CHARTAB(bContext *C, uiBlock *block, uiBut *but, uiHandleButtonData *data, wmEvent *event)
|
||||||
{
|
{
|
||||||
@ -3926,7 +4007,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event)
|
|||||||
}
|
}
|
||||||
/* reset to default */
|
/* reset to default */
|
||||||
else if(event->type == ZEROKEY && event->val == KM_PRESS) {
|
else if(event->type == ZEROKEY && event->val == KM_PRESS) {
|
||||||
if (!(ELEM(but->type, HSVCIRCLE, HSVCUBE)))
|
if (!(ELEM3(but->type, HSVCIRCLE, HSVCUBE, HISTOGRAM)))
|
||||||
ui_set_but_default(C, but);
|
ui_set_but_default(C, but);
|
||||||
}
|
}
|
||||||
/* handle menu */
|
/* handle menu */
|
||||||
@ -3996,8 +4077,9 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event)
|
|||||||
case ROW:
|
case ROW:
|
||||||
case LISTROW:
|
case LISTROW:
|
||||||
case BUT_IMAGE:
|
case BUT_IMAGE:
|
||||||
case HISTOGRAM:
|
|
||||||
retval= ui_do_but_EXIT(C, but, data, event);
|
retval= ui_do_but_EXIT(C, but, data, event);
|
||||||
|
case HISTOGRAM:
|
||||||
|
retval= ui_do_but_HISTOGRAM(C, block, but, data, event);
|
||||||
break;
|
break;
|
||||||
case TEX:
|
case TEX:
|
||||||
case IDPOIN:
|
case IDPOIN:
|
||||||
|
@ -439,7 +439,7 @@ extern void gl_round_box_vertical_shade(int mode, float minx, float miny, float
|
|||||||
|
|
||||||
void ui_draw_gradient(rcti *rect, float *rgb, int type, float alpha);
|
void ui_draw_gradient(rcti *rect, float *rgb, int type, float alpha);
|
||||||
|
|
||||||
void ui_draw_but_HISTOGRAM(uiBut *but, struct uiWidgetColors *wcol, rcti *rect);
|
void ui_draw_but_HISTOGRAM(ARegion *ar, uiBut *but, struct uiWidgetColors *wcol, rcti *rect);
|
||||||
void ui_draw_but_COLORBAND(uiBut *but, struct uiWidgetColors *wcol, rcti *rect);
|
void ui_draw_but_COLORBAND(uiBut *but, struct uiWidgetColors *wcol, rcti *rect);
|
||||||
void ui_draw_but_NORMAL(uiBut *but, struct uiWidgetColors *wcol, rcti *rect);
|
void ui_draw_but_NORMAL(uiBut *but, struct uiWidgetColors *wcol, rcti *rect);
|
||||||
void ui_draw_but_CURVE(ARegion *ar, uiBut *but, struct uiWidgetColors *wcol, rcti *rect);
|
void ui_draw_but_CURVE(ARegion *ar, uiBut *but, struct uiWidgetColors *wcol, rcti *rect);
|
||||||
|
@ -2712,7 +2712,7 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case HISTOGRAM:
|
case HISTOGRAM:
|
||||||
ui_draw_but_HISTOGRAM(but, &tui->wcol_regular, rect);
|
ui_draw_but_HISTOGRAM(ar, but, &tui->wcol_regular, rect);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case BUT_CURVE:
|
case BUT_CURVE:
|
||||||
|
@ -702,11 +702,6 @@ void draw_image_main(SpaceImage *sima, ARegion *ar, Scene *scene)
|
|||||||
if(ibuf && ima && show_render)
|
if(ibuf && ima && show_render)
|
||||||
draw_render_info(ima, ar);
|
draw_render_info(ima, ar);
|
||||||
|
|
||||||
/* histogram */
|
|
||||||
if (ibuf) {
|
|
||||||
histogram_update(&sima->hist, ibuf);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* XXX integrate this code */
|
/* XXX integrate this code */
|
||||||
#if 0
|
#if 0
|
||||||
if(ibuf) {
|
if(ibuf) {
|
||||||
|
@ -815,6 +815,13 @@ static void image_scope_area_init(wmWindowManager *wm, ARegion *ar)
|
|||||||
|
|
||||||
static void image_scope_area_draw(const bContext *C, ARegion *ar)
|
static void image_scope_area_draw(const bContext *C, ARegion *ar)
|
||||||
{
|
{
|
||||||
|
SpaceImage *sima= CTX_wm_space_image(C);
|
||||||
|
void *lock;
|
||||||
|
ImBuf *ibuf= ED_space_image_acquire_buffer(sima, &lock);
|
||||||
|
|
||||||
|
histogram_update(&sima->hist, ibuf);
|
||||||
|
ED_space_image_release_buffer(sima, lock);
|
||||||
|
|
||||||
ED_region_panels(C, ar, 1, NULL, -1);
|
ED_region_panels(C, ar, 1, NULL, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -822,6 +829,22 @@ static void image_scope_area_listener(ARegion *ar, wmNotifier *wmn)
|
|||||||
{
|
{
|
||||||
/* context changes */
|
/* context changes */
|
||||||
switch(wmn->category) {
|
switch(wmn->category) {
|
||||||
|
case NC_SCENE:
|
||||||
|
switch(wmn->data) {
|
||||||
|
case ND_MODE:
|
||||||
|
case ND_RENDER_RESULT:
|
||||||
|
case ND_COMPO_RESULT:
|
||||||
|
ED_region_tag_redraw(ar);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case NC_IMAGE:
|
||||||
|
ED_region_tag_redraw(ar);
|
||||||
|
break;
|
||||||
|
case NC_NODE:
|
||||||
|
ED_region_tag_redraw(ar);
|
||||||
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,12 +83,12 @@ typedef struct CurveMapping {
|
|||||||
typedef struct Histogram {
|
typedef struct Histogram {
|
||||||
int channels;
|
int channels;
|
||||||
int x_resolution;
|
int x_resolution;
|
||||||
float data_r[512];
|
float data_r[256];
|
||||||
float data_g[512];
|
float data_g[256];
|
||||||
float data_b[512];
|
float data_b[256];
|
||||||
float min, max;
|
float xmax, ymax;
|
||||||
int ok;
|
int ok;
|
||||||
int pad;
|
int flag;
|
||||||
} Histogram;
|
} Histogram;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -524,8 +524,22 @@ static int rna_SceneRenderData_engine_get(PointerRNA *ptr)
|
|||||||
|
|
||||||
static void rna_SceneRenderData_color_management_update(Main *bmain, Scene *unused, PointerRNA *ptr)
|
static void rna_SceneRenderData_color_management_update(Main *bmain, Scene *unused, PointerRNA *ptr)
|
||||||
{
|
{
|
||||||
/* reset all generated image block buffers to prevent out-of-date conversions */
|
/* reset image nodes */
|
||||||
BKE_image_free_image_ibufs();
|
Scene *scene= (Scene*)ptr->id.data;
|
||||||
|
bNodeTree *ntree=scene->nodetree;
|
||||||
|
bNode *node;
|
||||||
|
|
||||||
|
if(ntree && scene->use_nodes) {
|
||||||
|
for (node=ntree->nodes.first; node; node=node->next) {
|
||||||
|
if (ELEM(node->type, CMP_NODE_VIEWER, CMP_NODE_IMAGE)) {
|
||||||
|
ED_node_changed_update(&scene->id, node);
|
||||||
|
WM_main_add_notifier(NC_NODE|NA_EDITED, node);
|
||||||
|
|
||||||
|
if (node->type == CMP_NODE_IMAGE)
|
||||||
|
BKE_image_signal((Image *)node->id, NULL, IMA_SIGNAL_RELOAD);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void rna_SceneRenderLayer_name_set(PointerRNA *ptr, const char *value)
|
static void rna_SceneRenderLayer_name_set(PointerRNA *ptr, const char *value)
|
||||||
|
Loading…
Reference in New Issue
Block a user