diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-26 11:32:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-26 11:32:24 +0400 |
| commit | d4cfdc69ef95728a39f085283ba812cec856d757 (patch) | |
| tree | 4d705b15a2123a8ae67406436c7e9a9ddbf676cf /source/blender/compositor/operations/COM_OutputFileOperation.cpp | |
| parent | 69ab13a7dbc414b41bd9a04a49bac0a9127c583a (diff) | |
quiet all -Wshadow warnings in the compositor.
Diffstat (limited to 'source/blender/compositor/operations/COM_OutputFileOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_OutputFileOperation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp index ecfcdb7c70f..087e7a15e39 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp +++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp @@ -150,10 +150,10 @@ void OutputSingleLayerOperation::deinitExecution() } -OutputOpenExrLayer::OutputOpenExrLayer(const char *name, DataType datatype) +OutputOpenExrLayer::OutputOpenExrLayer(const char *name_, DataType datatype_) { - BLI_strncpy(this->name, name, sizeof(this->name)); - this->datatype = datatype; + BLI_strncpy(this->name, name_, sizeof(this->name)); + this->datatype = datatype_; /* these are created in initExecution */ this->outputBuffer = 0; this->imageInput = 0; |