diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-11-07 20:36:49 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-11-07 20:36:49 +0400 |
| commit | edec46b0a6aac18f406991b9e16228d4bd848c61 (patch) | |
| tree | 1240768d737c63705fdb38c9832d926ed0bcda94 /source/blender/editors/space_image/image_draw.c | |
| parent | 2ed6f077b3952123d56916980d18a379ecb3e5ac (diff) | |
| parent | 4d7a9e5c055fd3903162b61fdd40fb77b2b96793 (diff) | |
Merge with trunk r41625
Diffstat (limited to 'source/blender/editors/space_image/image_draw.c')
| -rw-r--r-- | source/blender/editors/space_image/image_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index 505452f504c..77ac577792c 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -127,7 +127,7 @@ static void draw_render_info(Scene *scene, Image *ima, ARegion *ar) BKE_image_release_renderresult(scene, ima); } -void draw_image_info(ARegion *ar, int color_manage, int channels, int x, int y, char *cp, float *fp, int *zp, float *zpf) +void draw_image_info(ARegion *ar, int color_manage, int channels, int x, int y, const char cp[4], const float fp[4], int *zp, float *zpf) { char str[256]; float dx= 6; |