diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-06-16 16:00:03 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-06-16 16:00:03 +0400 |
| commit | b937a4f5b6adc6bc0dca62cb5c87db08c873cfba (patch) | |
| tree | f489aca8e10e2a686fc1d1397397f99e1e1f2077 /source/blender/render/intern/include | |
| parent | 3de22dec26606c2c526f7193db038fa5125f9b03 (diff) | |
| parent | f227c4a064d96909243b4a60a7f6c544f521817a (diff) | |
Merge with trunk r37546
Diffstat (limited to 'source/blender/render/intern/include')
| -rw-r--r-- | source/blender/render/intern/include/render_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index cf16211b6d1..b2535ebc9ea 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -214,7 +214,7 @@ struct Render ListBase instancetable; int totinstance; - struct Image *backbuf, *bakebuf; + struct Image *bakebuf; struct GHash *orco_hash; |