diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-28 09:17:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-28 09:17:09 +0400 |
| commit | ff837cbe9b2a27678a6111207ce60b64f44d5917 (patch) | |
| tree | de1f188ed4d2b0659a8ebecb3a1e8b4792483065 /source/blender/render | |
| parent | c914b11614fff23bca5b601da24f02ab51b9db52 (diff) | |
| parent | 4b635d16316d12dd4c57e1dcf99092551e6bbe35 (diff) | |
svn merge -r41310:41329 ^/trunk/blender
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index bbe32765443..64b36c1fd12 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -405,7 +405,7 @@ static const char *get_pass_name(int passtype, int channel) return "Unknown"; } -static int passtype_from_name(char *str) +static int passtype_from_name(const char *str) { if(strcmp(str, "Combined")==0) |