griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #112052: Theme access asserts on startup

Browse Source 
Resolve an issue where drawing the status-bar's report info could
assert on startup. This was probably caused by accessing theme colors
before drawing.

The reporter traced this back to [0] however I couldn't reproduce the
problem. Remove theme access from INFO_OT_reports_display_update as the
color has not been used since [1].

[0]: 6de294a191
[1]: 694bc4d040
This commit is contained in:
Campbell Barton
2023-09-07 15:54:55 +10:00
parent 3059c3ee26
commit 3f9a15bc30
2 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/space_info/info_ops.cc
View File

@@ -34,7 +34,6 @@
#include "WM_types.hh"
#include "UI_interface.hh"
#include "UI_resources.hh"
#include "RNA_access.hh"
#include "RNA_define.hh"
@@ -581,7 +580,6 @@ static int update_reports_display_invoke(bContext *C, wmOperator * /*op*/, const
ReportList *reports = CTX_wm_reports(C);
Report *report;
ReportTimerInfo *rti;
float target_col[4] = {0.0f, 0.0f, 0.0f, 0.0f};
float progress = 0.0, flash_progress = 0.0;
float timeout = 0.0, flash_timeout = FLASH_TIMEOUT;
int send_note = 0;
@@ -608,19 +606,7 @@ static int update_reports_display_invoke(bContext *C, wmOperator * /*op*/, const
return (OPERATOR_FINISHED | OPERATOR_PASS_THROUGH);
}
/* set target color based on report type */
UI_GetThemeColorType3fv(UI_icon_colorid_from_report_type(report->type), SPACE_INFO, target_col);
target_col[3] = 0.65f;
if (rti->widthfac == 0.0f) {
/* initialize color to a brighter shade of the target color */
rti->col[0] = target_col[0] + BRIGHTEN_AMOUNT;
rti->col[1] = target_col[1] + BRIGHTEN_AMOUNT;
rti->col[2] = target_col[2] + BRIGHTEN_AMOUNT;
rti->col[3] = 1.0f;
CLAMP3(rti->col, 0.0, 1.0);
rti->widthfac = 1.0f;
}
@@ -629,10 +615,8 @@ static int update_reports_display_invoke(bContext *C, wmOperator * /*op*/, const
/* save us from too many draws */
if (flash_progress <= 1.0f) {
/* Flash report briefly according to progress through fade-out duration. */
send_note = 1;
/* flash report briefly according to progress through fade-out duration */
interp_v4_v4v4(rti->col, rti->col, target_col, flash_progress);
}
rti->flash_progress = flash_progress;

1
source/blender/makesdna/DNA_windowmanager_types.h
View File

@@ -105,7 +105,6 @@ typedef struct ReportList {
#
#
typedef struct ReportTimerInfo {
float col[4];
float widthfac;
float flash_progress;
} ReportTimerInfo;