Merge branch 'master' into temp-gpencil-drw-engine

 Conflicts:
	source/blender/draw/engines/gpencil/gpencil_engine.c

1 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp
index 79e3b2f1108..c06994d7cdb 100644
--- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp
+++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp
@@ -162,7 +162,7 @@ static void write_buffer_rect(rcti *rect,
     for (x = x1; x < x2 && (!breaked); x++) {
       reader->readSampled(color, x, y, COM_PS_NEAREST);
 
-      for (i = 0; i < size; ++i) {
+      for (i = 0; i < size; i++) {
         buffer[offset + i] = color[i];
       }
       offset += size;
@@ -298,7 +298,7 @@ void OutputOpenExrMultiLayerOperation::add_layer(const char *name,
 
 void OutputOpenExrMultiLayerOperation::initExecution()
 {
-  for (unsigned int i = 0; i < this->m_layers.size(); ++i) {
+  for (unsigned int i = 0; i < this->m_layers.size(); i++) {
     if (this->m_layers[i].use_layer) {
       SocketReader *reader = getInputSocketReader(i);
       this->m_layers[i].imageInput = reader;
@@ -310,7 +310,7 @@ void OutputOpenExrMultiLayerOperation::initExecution()
 
 void OutputOpenExrMultiLayerOperation::executeRegion(rcti *rect, unsigned int /*tileNumber*/)
 {
-  for (unsigned int i = 0; i < this->m_layers.size(); ++i) {
+  for (unsigned int i = 0; i < this->m_layers.size(); i++) {
     OutputOpenExrLayer &layer = this->m_layers[i];
     if (layer.imageInput) {
       write_buffer_rect(rect,
@@ -343,7 +343,7 @@ void OutputOpenExrMultiLayerOperation::deinitExecution()
                                suffix);
     BLI_make_existing_file(filename);
 
-    for (unsigned int i = 0; i < this->m_layers.size(); ++i) {
+    for (unsigned int i = 0; i < this->m_layers.size(); i++) {
       OutputOpenExrLayer &layer = this->m_layers[i];
       if (!layer.imageInput) {
         continue; /* skip unconnected sockets */
@@ -369,7 +369,7 @@ void OutputOpenExrMultiLayerOperation::deinitExecution()
     }
 
     IMB_exr_close(exrhandle);
-    for (unsigned int i = 0; i < this->m_layers.size(); ++i) {
+    for (unsigned int i = 0; i < this->m_layers.size(); i++) {
       if (this->m_layers[i].outputBuffer) {
         MEM_freeN(this->m_layers[i].outputBuffer);
         this->m_layers[i].outputBuffer = NULL;