diff options
| author | Ines Almeida <britalmeida@gmail.com> | 2015-01-13 14:04:25 +0300 |
|---|---|---|
| committer | Ines Almeida <britalmeida@gmail.com> | 2015-01-13 14:04:25 +0300 |
| commit | cb61c5aeee94af943b0306550daef45c2018126a (patch) | |
| tree | dbb2a9b5600bc53de35162e79091772bff1b6f8b /source/blender/editors/include/UI_interface_icons.h | |
| parent | d7cabe7d6f4519856969137df415692e16a5372d (diff) | |
| parent | 117edbbf881be1764db852d9805c523590a19f84 (diff) | |
Merge branch 'master' into soc-2014-bgesoc-2014-bge
Diffstat (limited to 'source/blender/editors/include/UI_interface_icons.h')
| -rw-r--r-- | source/blender/editors/include/UI_interface_icons.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h index 2ba3d309aa7..74927428363 100644 --- a/source/blender/editors/include/UI_interface_icons.h +++ b/source/blender/editors/include/UI_interface_icons.h @@ -64,7 +64,8 @@ void UI_icons_init(int first_dyn_id); int UI_icon_get_width(int icon_id); int UI_icon_get_height(int icon_id); -void UI_id_icon_render(const struct bContext *C, struct ID *id, const bool big, const bool use_job); +void UI_id_icon_render( + const struct bContext *C, struct Scene *scene, struct ID *id, const bool big, const bool use_job); void UI_icon_draw(float x, float y, int icon_id); void UI_icon_draw_preview(float x, float y, int icon_id); |