diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-01 18:59:06 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-01 18:59:06 +0400 |
| commit | 07ce209c64d47b7773b473d31abdddac6f404c71 (patch) | |
| tree | 3953e311461777c5b23b952380552d92e7c0415e | |
| parent | 32fe2d71fc74b3931dc189590e8b1e4636f1af73 (diff) | |
code cleanup: warnings
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/compositor/intern/COM_ExecutionGroup.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 114ff47663b..2127ad23bd3 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -65,7 +65,7 @@ include_directories( if(WITH_CYCLES_BLENDER) add_definitions(-DBLENDER_PLUGIN) add_subdirectory(blender) -endif(WITH_CYCLES_BLENDER) +endif() add_subdirectory(app) add_subdirectory(bvh) diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp index 7ac3f757d8e..0ebf9af207b 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp +++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp @@ -436,7 +436,7 @@ MemoryBuffer *ExecutionGroup::constructConsolidatedMemoryBuffer(MemoryProxy *mem for (indexx = max(minxchunk, 0); indexx<min((int)this->numberOfXChunks, maxxchunk) ; indexx++) { for (indexy = max(minychunk, 0); indexy<min((int)this->numberOfYChunks, maxychunk) ; indexy++) { - int chunkNumber = indexx+indexy*this->numberOfXChunks; + /* int chunkNumber = indexx+indexy*this->numberOfXChunks; */ /* UNUSED */ MemoryBuffer *chunkBuffer = memoryProxy->getBuffer(); result->copyContentFrom(chunkBuffer); } @@ -491,7 +491,7 @@ MemoryBuffer *ExecutionGroup::allocateOutputBuffer(int chunkNumber, rcti *rect) // output allocation is only valid when our outputoperation is a memorywriter NodeOperation * operation = this->getOutputNodeOperation(); if (operation->isWriteBufferOperation()) { - WriteBufferOperation *writeOperation = (WriteBufferOperation*)operation; +/* WriteBufferOperation *writeOperation = (WriteBufferOperation*)operation; */ /* UNUSED */ // @todo outputBuffer = MemoryManager::allocateMemoryBuffer(writeOperation->getMemoryProxy(), chunkNumber, rect); } return outputBuffer; |