diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-01-12 06:41:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-12 06:41:12 +0300 |
| commit | 63018144badeb10c858504c918a3f66047c068b0 (patch) | |
| tree | 5982ba549aa3e23a68a412877f51d100ae1bb920 /source/blender/imbuf | |
| parent | 21fc4cabaff9b1caa476af9d700195fb239a07c6 (diff) | |
remove redundant assignments & unused vars.
also minor functional changes
- OBJECT_OT_make_links_data() type property is now assigned to the operator property (so popup menu can find it)
- removing BG image now returns cancelled if no image is removed.
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/divers.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c index 1ea11432025..9e2c32765d2 100644 --- a/source/blender/imbuf/intern/divers.c +++ b/source/blender/imbuf/intern/divers.c @@ -228,13 +228,9 @@ static void imb_float_from_rect_linear(struct ImBuf *ibuf, float *fbuf) void IMB_float_from_rect(struct ImBuf *ibuf) { /* quick method to convert byte to floatbuf */ - float *tof = ibuf->rect_float; - - unsigned char *to = (unsigned char *) ibuf->rect; - if(to==NULL) return; - if(tof==NULL) { + if(ibuf->rect==NULL) return; + if(ibuf->rect_float==NULL) { if (imb_addrectfloatImBuf(ibuf) == 0) return; - tof = ibuf->rect_float; } /* Float bufs should be stored linear */ |