Merge remote-tracking branch 'origin/win-64bit'

2017-10-17 00:55:22 +08:00
parent e47aa5d567 f1f8bf0e4d
commit 88e15147b8
68 changed files with 313 additions and 291 deletions
@@ -998,7 +998,7 @@ void PostProcessing::renderGaussian3Blur(const FrameBuffer &in_fbo,
 // ----------------------------------------------------------------------------
 void PostProcessing::renderGaussian6BlurLayer(const FrameBuffer &in_fbo,
                                              const FrameBuffer &scalar_fbo,
-                                              size_t layer, float sigma_h,
+                                              unsigned int layer, float sigma_h,
                                              float sigma_v) const
 {
 #if !defined(USE_GLES2)