[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55002] trunk/blender/source: code cleanup : unused vars in collada, preprocessor formatting & warning in mingw.
Campbell Barton
ideasman42 at gmail.com
Mon Mar 4 01:53:58 CET 2013
Revision: 55002
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55002
Author: campbellbarton
Date: 2013-03-04 00:53:57 +0000 (Mon, 04 Mar 2013)
Log Message:
-----------
code cleanup: unused vars in collada, preprocessor formatting & warning in mingw.
also compiling without bullet needed a stub added.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/depsgraph_private.h
trunk/blender/source/blender/blenkernel/intern/rigidbody.c
trunk/blender/source/blender/collada/ControllerExporter.cpp
trunk/blender/source/blender/collada/GeometryExporter.cpp
trunk/blender/source/blender/collada/MeshImporter.cpp
trunk/blender/source/blender/compositor/COM_compositor.h
trunk/blender/source/gameengine/Expressions/Value.h
trunk/blender/source/gameengine/GamePlayer/common/GPC_Canvas.h
trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
trunk/blender/source/gameengine/Network/NG_NetworkScene.h
trunk/blender/source/tools/check_style_c.py
Modified: trunk/blender/source/blender/blenkernel/depsgraph_private.h
===================================================================
--- trunk/blender/source/blender/blenkernel/depsgraph_private.h 2013-03-04 00:28:25 UTC (rev 55001)
+++ trunk/blender/source/blender/blenkernel/depsgraph_private.h 2013-03-04 00:53:57 UTC (rev 55002)
@@ -137,8 +137,6 @@
DagNode *dag_get_sub_node(DagForest *forest, void *fob);
void dag_add_relation(DagForest *forest, DagNode *fob1, DagNode *fob2, short rel, const char *name);
-void graph_bfs(void);
-
DagNodeQueue *graph_dfs(void);
void set_node_xy(DagNode *node, float x, float y);
Modified: trunk/blender/source/blender/blenkernel/intern/rigidbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/rigidbody.c 2013-03-04 00:28:25 UTC (rev 55001)
+++ trunk/blender/source/blender/blenkernel/intern/rigidbody.c 2013-03-04 00:53:57 UTC (rev 55002)
@@ -1338,6 +1338,7 @@
void BKE_rigidbody_sync_transforms(RigidBodyWorld *rbw, Object *ob, float ctime) {}
void BKE_rigidbody_aftertrans_update(Object *ob, float loc[3], float rot[3], float quat[4], float rotAxis[3], float rotAngle) {}
void BKE_rigidbody_cache_reset(RigidBodyWorld *rbw) {}
+void BKE_rigidbody_rebuild_world(Scene *scene, float ctime) {}
void BKE_rigidbody_do_simulation(Scene *scene, float ctime) {}
#ifdef __GNUC__
Modified: trunk/blender/source/blender/collada/ControllerExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ControllerExporter.cpp 2013-03-04 00:28:25 UTC (rev 55001)
+++ trunk/blender/source/blender/collada/ControllerExporter.cpp 2013-03-04 00:53:57 UTC (rev 55002)
@@ -404,7 +404,7 @@
kb = kb->next;
for (; kb; kb = kb->next) {
// XXX why is the weight not used here and set to 0.0?
- float weight = kb->curval;
+ // float weight = kb->curval;
extra.addExtraTechniqueParameter ("KHR", "morph_weights" , 0.000, "MORPH_WEIGHT_TO_TARGET");
}
}
Modified: trunk/blender/source/blender/collada/GeometryExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/GeometryExporter.cpp 2013-03-04 00:28:25 UTC (rev 55001)
+++ trunk/blender/source/blender/collada/GeometryExporter.cpp 2013-03-04 00:53:57 UTC (rev 55002)
@@ -76,7 +76,6 @@
#endif
bool use_instantiation = this->export_settings->use_object_instantiation;
- bool triangulate = this->export_settings->triangulate;
Mesh *me = bc_get_mesh_copy( mScene,
ob,
this->export_settings->export_mesh_type,
@@ -379,8 +378,6 @@
// <p>
int texindex = 0;
- unsigned int vi = 0;
- unsigned int ni = 0;
for (i = 0; i < totpolys; i++) {
MPoly *p = &mpolys[i];
int loop_count = p->totloop;
Modified: trunk/blender/source/blender/collada/MeshImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/MeshImporter.cpp 2013-03-04 00:28:25 UTC (rev 55001)
+++ trunk/blender/source/blender/collada/MeshImporter.cpp 2013-03-04 00:53:57 UTC (rev 55002)
@@ -384,7 +384,6 @@
for (int i = 0; i < totuvset; i++) {
COLLADAFW::MeshVertexData::InputInfos *info = collada_mesh->getUVCoords().getInputInfosArray()[i];
COLLADAFW::String &uvname = info->mName;
- int x = 0;
// Allocate space for UV_data
CustomData_add_layer_named(&me->pdata, CD_MTEXPOLY, CD_DEFAULT, NULL, me->totpoly, uvname.c_str());
CustomData_add_layer_named(&me->ldata, CD_MLOOPUV, CD_DEFAULT, NULL, me->totloop, uvname.c_str());
Modified: trunk/blender/source/blender/compositor/COM_compositor.h
===================================================================
--- trunk/blender/source/blender/compositor/COM_compositor.h 2013-03-04 00:28:25 UTC (rev 55001)
+++ trunk/blender/source/blender/compositor/COM_compositor.h 2013-03-04 00:53:57 UTC (rev 55002)
@@ -20,9 +20,9 @@
* Monique Dewanchand
*/
- #ifdef __cplusplus
+#ifdef __cplusplus
extern "C" {
- #endif
+#endif
#include "DNA_color_types.h"
#include "DNA_node_types.h"
Modified: trunk/blender/source/gameengine/Expressions/Value.h
===================================================================
--- trunk/blender/source/gameengine/Expressions/Value.h 2013-03-04 00:28:25 UTC (rev 55001)
+++ trunk/blender/source/gameengine/Expressions/Value.h 2013-03-04 00:53:57 UTC (rev 55002)
@@ -253,9 +253,9 @@
// Increase global reference count, used to see at the end of the program
// if all CValue-derived classes have been dereferenced to 0
//debug(gRefCountValue++);
- #ifdef _DEBUG
+#ifdef _DEBUG
//gRefCountValue++;
- #endif
+#endif
m_refcount++;
return this;
}
@@ -266,9 +266,9 @@
// Decrease global reference count, used to see at the end of the program
// if all CValue-derived classes have been dereferenced to 0
//debug(gRefCountValue--);
- #ifdef _DEBUG
+#ifdef _DEBUG
//gRefCountValue--;
- #endif
+#endif
// Decrease local reference count, if it reaches 0 the object should be freed
if (--m_refcount > 0)
{
Modified: trunk/blender/source/gameengine/GamePlayer/common/GPC_Canvas.h
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/common/GPC_Canvas.h 2013-03-04 00:28:25 UTC (rev 55001)
+++ trunk/blender/source/gameengine/GamePlayer/common/GPC_Canvas.h 2013-03-04 00:53:57 UTC (rev 55002)
@@ -36,8 +36,8 @@
#include "RAS_Rect.h"
#ifdef WIN32
- #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
- #include <windows.h>
+# pragma warning (disable:4786) // suppress stl-MSVC debug info warning
+# include <windows.h>
#endif /* WIN32 */
#include "GL/glew.h"
Modified: trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp 2013-03-04 00:28:25 UTC (rev 55001)
+++ trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp 2013-03-04 00:53:57 UTC (rev 55002)
@@ -68,8 +68,8 @@
#include "KX_BulletPhysicsController.h"
#include "btBulletDynamicsCommon.h"
- #ifdef WIN32
-#if _MSC_VER >= 1310
+#ifdef WIN32
+#if defined(_MSC_VER) && (_MSC_VER >= 1310)
//only use SIMD Hull code under Win32
//#define TEST_HULL 1
#ifdef TEST_HULL
Modified: trunk/blender/source/gameengine/Network/NG_NetworkScene.h
===================================================================
--- trunk/blender/source/gameengine/Network/NG_NetworkScene.h 2013-03-04 00:28:25 UTC (rev 55001)
+++ trunk/blender/source/gameengine/Network/NG_NetworkScene.h 2013-03-04 00:53:57 UTC (rev 55002)
@@ -42,7 +42,7 @@
//MSVC defines SendMessage as a win api function, even though we aren't using it
#ifdef SendMessage
- #undef SendMessage
+# undef SendMessage
#endif
using namespace std;
Modified: trunk/blender/source/tools/check_style_c.py
===================================================================
--- trunk/blender/source/tools/check_style_c.py 2013-03-04 00:28:25 UTC (rev 55001)
+++ trunk/blender/source/tools/check_style_c.py 2013-03-04 00:53:57 UTC (rev 55002)
@@ -33,7 +33,7 @@
from check_style_c_config import IGNORE, IGNORE_DIR, SOURCE_DIR
IGNORE = tuple([os.path.join(SOURCE_DIR, ig) for ig in IGNORE])
IGNORE_DIR = tuple([os.path.join(SOURCE_DIR, ig) for ig in IGNORE_DIR])
-WARN_TEXT = True
+WARN_TEXT = False
def is_ignore(f):
for ig in IGNORE:
More information about the Bf-blender-cvs
mailing list