code cleanup: warnings
authorCampbell Barton <ideasman42@gmail.com>
Fri, 1 Jun 2012 14:59:06 +0000 (14:59 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 1 Jun 2012 14:59:06 +0000 (14:59 +0000)
intern/cycles/CMakeLists.txt
source/blender/compositor/intern/COM_ExecutionGroup.cpp

index 114ff47663b8e6172984812099423225825571d6..2127ad23bd3c2b6cd986f31fc2f0351c7d4dfcf7 100644 (file)
@@ -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)
index 7ac3f757d8e80e69915a7233dfbb8cdb5f420626..0ebf9af207ba3b09892d48d34999248b3d414f2f 100644 (file)
@@ -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;