[Bf-blender-cvs] [c59ca9e] master: silence MSVC warning

Mike Erwin noreply at git.blender.org
Tue Mar 31 20:58:50 CEST 2015


Commit: c59ca9e477d23884997046d61d9ea20c78ee06bb
Author: Mike Erwin
Date:   Tue Mar 31 14:57:19 2015 -0400
Branches: master
https://developer.blender.org/rBc59ca9e477d23884997046d61d9ea20c78ee06bb

silence MSVC warning

‘*/‘ found outside of comment

===================================================================

M	source/blender/compositor/operations/COM_CalculateMeanOperation.cpp

===================================================================

diff --git a/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp b/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
index 32395f4..d26dcd1 100644
--- a/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
+++ b/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
@@ -46,7 +46,7 @@ void CalculateMeanOperation::initExecution()
 
 void CalculateMeanOperation::executePixel(float output[4],
                                           int /*x*/, int /*y*/,
-                                          void */*data*/)
+                                          void * /*data*/)
 {
 	output[0] = this->m_result;
 }




More information about the Bf-blender-cvs mailing list