[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50646] trunk/blender: fix for error in recent commit (made function static that shouldn' t have been), add extra gcc warnings to cmake.
Campbell Barton
ideasman42 at gmail.com
Sun Sep 16 03:35:05 CEST 2012
Revision: 50646
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50646
Author: campbellbarton
Date: 2012-09-16 01:35:00 +0000 (Sun, 16 Sep 2012)
Log Message:
-----------
fix for error in recent commit (made function static that shouldn't have been), add extra gcc warnings to cmake.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/GNUmakefile
trunk/blender/build_files/cmake/config/blender_lite.cmake
trunk/blender/intern/iksolver/intern/IK_Solver.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
trunk/blender/source/gameengine/VideoTexture/blendVideoTex.cpp
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-09-16 00:26:36 UTC (rev 50645)
+++ trunk/blender/CMakeLists.txt 2012-09-16 01:35:00 UTC (rev 50646)
@@ -1725,6 +1725,11 @@
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_WRITE_STRINGS -Wwrite-strings)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_LOGICAL_OP -Wlogical-op)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNDEF -Wundef)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNINITIALIZED -Wuninitialized)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_INIT_SELF -Winit-self) # needs -Wuninitialized
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_NULL -Wnonnull)
# # this causes too many warnings, disable
# ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNDEFINED -Wundef)
@@ -1739,6 +1744,12 @@
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_MISSING_DECLARATIONS -Wmissing-declarations)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_LOGICAL_OP -Wlogical-op)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEF -Wundef)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNINITIALIZED -Wuninitialized)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_INIT_SELF -Winit-self) # needs -Wuninitialized
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_NULL -Wnonnull)
# # this causes too many warnings, disable
# ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEFINED -Wundef)
Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile 2012-09-16 00:26:36 UTC (rev 50645)
+++ trunk/blender/GNUmakefile 2012-09-16 01:35:00 UTC (rev 50646)
@@ -173,6 +173,7 @@
@echo " * check_cppcheck - run blender source through cppcheck (C & C++)"
@echo " * check_splint - run blenders source through splint (C only)"
@echo " * check_sparse - run blenders source through sparse (C only)"
+ @echo " * check_smatch - run blenders source through smatch (C only)"
@echo " * check_spelling_c - check for spelling errors (C/C++ only)"
@echo " * check_spelling_py - check for spelling errors (Python only)"
@echo ""
Modified: trunk/blender/build_files/cmake/config/blender_lite.cmake
===================================================================
--- trunk/blender/build_files/cmake/config/blender_lite.cmake 2012-09-16 00:26:36 UTC (rev 50645)
+++ trunk/blender/build_files/cmake/config/blender_lite.cmake 2012-09-16 01:35:00 UTC (rev 50646)
@@ -42,6 +42,7 @@
set(WITH_AUDASPACE OFF CACHE FORCE BOOL)
set(WITH_OPENAL OFF CACHE FORCE BOOL)
set(WITH_OPENCOLLADA OFF CACHE FORCE BOOL)
+set(WITH_OPENCOLORIO OFF CACHE FORCE BOOL)
set(WITH_OPENMP OFF CACHE FORCE BOOL)
set(WITH_PYTHON_INSTALL OFF CACHE FORCE BOOL)
set(WITH_RAYOPTIMIZATION OFF CACHE FORCE BOOL)
Modified: trunk/blender/intern/iksolver/intern/IK_Solver.cpp
===================================================================
--- trunk/blender/intern/iksolver/intern/IK_Solver.cpp 2012-09-16 00:26:36 UTC (rev 50645)
+++ trunk/blender/intern/iksolver/intern/IK_Solver.cpp 2012-09-16 01:35:00 UTC (rev 50646)
@@ -51,7 +51,7 @@
};
// FIXME: locks still result in small "residual" changes to the locked axes...
-IK_QSegment *CreateSegment(int flag, bool translate)
+static IK_QSegment *CreateSegment(int flag, bool translate)
{
int ndof = 0;
ndof += (flag & IK_XDOF) ? 1 : 0;
@@ -348,7 +348,7 @@
return qsolver->solver.GetPoleAngle();
}
-void IK_SolverAddCenterOfMass(IK_Solver *solver, IK_Segment *root, float goal[3], float weight)
+static void IK_SolverAddCenterOfMass(IK_Solver *solver, IK_Segment *root, float goal[3], float weight)
{
if (solver == NULL || root == NULL)
return;
Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInitTypes.cpp 2012-09-16 00:26:36 UTC (rev 50645)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonInitTypes.cpp 2012-09-16 01:35:00 UTC (rev 50646)
@@ -29,14 +29,10 @@
* \ingroup ketsji
*/
-
-
-
-#ifndef _adr_py_init_types_h_ // only process once,
-#define _adr_py_init_types_h_ // even if multiply included
-
#ifdef WITH_PYTHON
+#include "KX_PythonInitTypes.h"
+
/* Only for Class::Parents */
#include "BL_BlenderShader.h"
#include "BL_ShapeActionActuator.h"
@@ -164,7 +160,7 @@
#define PyType_Ready_Attr(d, n, i) PyType_Ready_ADD(d, &n::Type, n::Attributes, NULL, i)
#define PyType_Ready_AttrPtr(d, n, i) PyType_Ready_ADD(d, &n::Type, n::Attributes, n::AttributesPtr, i)
-static void initPyTypes(void)
+void initPyTypes(void)
{
/*
@@ -266,5 +262,3 @@
}
#endif // WITH_PYTHON
-
-#endif
Modified: trunk/blender/source/gameengine/VideoTexture/blendVideoTex.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/blendVideoTex.cpp 2012-09-16 00:26:36 UTC (rev 50645)
+++ trunk/blender/source/gameengine/VideoTexture/blendVideoTex.cpp 2012-09-16 01:35:00 UTC (rev 50646)
@@ -26,6 +26,8 @@
#include "PyObjectPlus.h"
+#include "KX_PythonInit.h"
+
#include <RAS_GLExtensionManager.h>
#include <RAS_IPolygonMaterial.h>
@@ -168,7 +170,7 @@
0, /* m_free */
};
-static PyObject *initVideoTexture(void)
+PyObject *initVideoTexture(void)
{
PyObject * m;
More information about the Bf-blender-cvs
mailing list