Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-07-24 13:43:21 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-07-24 13:43:21 +0300
commit7f7e51161f65c371d0f0c6c39bd32cbea45694cd (patch)
treedcbea3537c2af964444535871b5e6712b1874108 /source/blender/editors/include/UI_interface_icons.h
parent293c15ec0cc3878bced1b52e274c078810ba2d8a (diff)
Fix T56079: crash with startup.blend saved in sculpt/paint modes.
This reverts commit 81a93df6d22c2f148667b9a6e8308e083a4cec39, it is not safe to handle initialization for startup.blend differently. Instead fix the root issue of the preview icon data structures not being initialized in time.
Diffstat (limited to 'source/blender/editors/include/UI_interface_icons.h')
-rw-r--r--source/blender/editors/include/UI_interface_icons.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h
index 651081c46bb..a34c4938b86 100644
--- a/source/blender/editors/include/UI_interface_icons.h
+++ b/source/blender/editors/include/UI_interface_icons.h
@@ -59,7 +59,7 @@ typedef struct IconFile {
/*
* Resizable Icons for Blender
*/
-void UI_icons_init(int first_dyn_id);
+void UI_icons_init(void);
int UI_icon_get_width(int icon_id);
int UI_icon_get_height(int icon_id);