Revision: 39946
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39946
Author: campbellbarton
Date: 2011-09-05 23:40:52 +0000 (Mon, 05 Sep 2011)
Log Message:
-----------
fix some complier warnings and add -Wundef to CMake's default GCC warnings.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/intern/opennl/CMakeLists.txt
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-09-05 22:15:07 UTC (rev 39945)
+++ trunk/blender/CMakeLists.txt 2011-09-05 23:40:52 UTC (rev 39946)
@@ -1267,6 +1267,7 @@
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_UNDEFINED -Wundef)
# disable because it gives warnings for printf() & friends.
# ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION
-Wdouble-promotion -Wno-error=double-promotion)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS
C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
@@ -1274,6 +1275,7 @@
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_UNDEFINED -Wundef)
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
Modified: trunk/blender/intern/opennl/CMakeLists.txt
===================================================================
--- trunk/blender/intern/opennl/CMakeLists.txt 2011-09-05 22:15:07 UTC (rev
39945)
+++ trunk/blender/intern/opennl/CMakeLists.txt 2011-09-05 23:40:52 UTC (rev
39946)
@@ -31,6 +31,13 @@
# and debug gives a lot of prints on UV unwrapping. developers can enable if
they need to.
remove_flag("-DDEBUG")
+
+# quiet compiler warnings about undefined defines
+add_definitions(
+ -DDEBUGlevel=0
+ -DPRNTlevel=0
+)
+
set(INC
extern
superlu
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2011-09-05
22:15:07 UTC (rev 39945)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2011-09-05
23:40:52 UTC (rev 39946)
@@ -158,7 +158,7 @@
ntree->init |= NTREE_TYPE_INIT;
}
-static bNodeSocket *make_socket(bNodeTree *ntree, int in_out, const char
*name, int type)
+static bNodeSocket *make_socket(bNodeTree *UNUSED(ntree), int in_out, const
char *name, int type)
{
bNodeSocketType *stype= ntreeGetSocketType(type);
bNodeSocket *sock;
Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c 2011-09-05
22:15:07 UTC (rev 39945)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c 2011-09-05
23:40:52 UTC (rev 39946)
@@ -549,7 +549,7 @@
bNodeSocket *sock;
rctf *rct= &node->totr;
float iconofs;
- float socket_size= NODE_SOCKSIZE*U.dpi/72;
+ /* float socket_size= NODE_SOCKSIZE*U.dpi/72; */ /* UNUSED */
float iconbutw= 0.8f*UI_UNIT_X;
int color_id= node_get_colorid(node);
char showname[128]; /* 128 used below */
Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c 2011-09-05
22:15:07 UTC (rev 39945)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c 2011-09-05
23:40:52 UTC (rev 39946)
@@ -2175,7 +2175,6 @@
bNode *node, *newnode, *lastnode;
bNodeLink *link, *newlink, *lastlink;
int keep_inputs = RNA_boolean_get(op->ptr, "keep_inputs");
- bNodeSocket *sock;
ED_preview_kill_jobs(C);
Modified: trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
2011-09-05 22:15:07 UTC (rev 39945)
+++ trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
2011-09-05 23:40:52 UTC (rev 39946)
@@ -243,7 +243,6 @@
for (int i=0; i<m_bmesh->totvert; ++i)
{
float contrib = 0.f, weight, max_weight=0.f;
- Bone *bone;
bPoseChannel *pchan=NULL;
MDeformVert *dvert;
Eigen::Map<Eigen::Vector3f> norm(m_transnors[i]);
@@ -266,7 +265,6 @@
if (index < numGroups && (pchan=m_dfnrToPC[index]))
{
weight = dvert->dw[j].weight;
- bone = pchan->bone;
if (weight)
{
Modified: trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
2011-09-05 22:15:07 UTC (rev 39945)
+++ trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
2011-09-05 23:40:52 UTC (rev 39946)
@@ -385,6 +385,12 @@
//This cache mecanism is buggy so I leave it disable and the memory leak
//that would result from this is fixed in RemoveScene()
m_map_mesh_to_gamemesh.clear();
+
+#ifndef USE_BULLET
+ /* quiet compiler warning */
+ (void)useDbvtCulling;
+#endif
+
}
// This function removes all entities stored in the converter for that scene
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
