Merging r49840 through r49854 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 12 Aug 2012 18:39:05 +0000 (18:39 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 12 Aug 2012 18:39:05 +0000 (18:39 +0000)
1  2 
source/blender/blenkernel/SConscript
source/blender/compositor/operations/COM_InpaintOperation.cpp

Simple merge
index eb732cc2b80f5f6b5b82d4743c0e25a57940c757,77bef54c4857857e595d7d36abe72ba4c4828689..b0e9c601e077ddd6c3ea29bfa79d3ccc65d4df5f
@@@ -208,9 -207,13 +206,15 @@@ void InpaintSimpleOperation::pix_step(i
                }
        }
  
-       mul_v3_v3fl(this->get_pixel(x, y), pix, 1.0f / n);
+       float *output = this->get_pixel(x, y);
+       if (pix_divider != 0.0f) {
+               mul_v3_fl(pix, 1.0f / pix_divider);
+               /* use existing pixels alpha to blend into */
+               interp_v3_v3v3(output, pix, output, output[3]);
+               output[3] = 1.0f;
+       }
 +
 +      this->get_pixel(x, y)[3] = 1.0f;
  }
  
  void *InpaintSimpleOperation::initializeTileData(rcti *rect)