diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 01:45:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 01:45:29 +0400 |
commit | 29b7b344fc48ed31b1e36818ab4767090691d6e2 (patch) | |
tree | 2c7496c8c656565d2ac6dc0901e1af66f8565101 /source/blender/editors/render | |
parent | c1ceab1281ccf061f03f8000bf190a082a5385d8 (diff) | |
parent | 7bfef29f2f2a1b262d28abdc6e30fcd9c1f1caad (diff) |
svn merge ^/trunk/blender -r55357:55372
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r-- | source/blender/editors/render/render_preview.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 7802e5460ff..dd5b97a68ed 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -192,7 +192,7 @@ static Main *G_pr_main = NULL; static Main *G_pr_main_cycles = NULL; #ifndef WITH_HEADLESS -static Main *load_main_from_memory(char *blend, int blend_size) +static Main *load_main_from_memory(const void *blend, int blend_size) { const int fileflags = G.fileflags; Main *bmain = NULL; |