[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55509] trunk/blender: code cleanup: unused defines, shadowing and unintended enum-as-variable.
Campbell Barton
ideasman42 at gmail.com
Fri Mar 22 15:31:04 CET 2013
Revision: 55509
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55509
Author: campbellbarton
Date: 2013-03-22 14:31:03 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
code cleanup: unused defines, shadowing and unintended enum-as-variable.
Modified Paths:
--------------
trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
trunk/blender/source/blender/blenfont/intern/blf_lang.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/gpu/intern/gpu_simple_shader.c
trunk/blender/source/blender/python/intern/bpy.c
trunk/blender/source/blender/python/intern/bpy_app.c
trunk/blender/source/blender/python/intern/gpu.c
trunk/blender/source/gameengine/Converter/BL_ModifierDeformer.cpp
Modified: trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_C-API.cpp 2013-03-22 13:53:58 UTC (rev 55508)
+++ trunk/blender/intern/audaspace/intern/AUD_C-API.cpp 2013-03-22 14:31:03 UTC (rev 55509)
@@ -26,15 +26,14 @@
* \ingroup audaspaceintern
*/
-
// needed for INT64_C
#ifndef __STDC_CONSTANT_MACROS
#define __STDC_CONSTANT_MACROS
#endif
#ifdef WITH_PYTHON
-#include "AUD_PyInit.h"
-#include "AUD_PyAPI.h"
+# include "AUD_PyInit.h"
+# include "AUD_PyAPI.h"
#endif
#include <set>
Modified: trunk/blender/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_lang.c 2013-03-22 13:53:58 UTC (rev 55508)
+++ trunk/blender/source/blender/blenfont/intern/blf_lang.c 2013-03-22 14:31:03 UTC (rev 55509)
@@ -207,8 +207,10 @@
#endif
}
-#define ULANGUAGE ((U.language >= 0 && U.language < num_locales) ? U.language : 0)
-#define LOCALE(_id) (locales ? locales[(_id)] : "")
+#ifdef WITH_INTERNATIONAL
+# define ULANGUAGE ((U.language >= 0 && U.language < num_locales) ? U.language : 0)
+# define LOCALE(_id) (locales ? locales[(_id)] : "")
+#endif
void BLF_lang_set(const char *str)
{
Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c 2013-03-22 13:53:58 UTC (rev 55508)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c 2013-03-22 14:31:03 UTC (rev 55509)
@@ -1132,7 +1132,6 @@
void node_draw_nodetree(const bContext *C, ARegion *ar, SpaceNode *snode, bNodeTree *ntree, bNodeInstanceKey parent_key)
{
bNode *node;
- bNodeInstanceKey key;
bNodeLink *link;
int a;
@@ -1146,6 +1145,7 @@
/* draw background nodes, last nodes in front */
for (a = 0, node = ntree->nodes.first; node; node = node->next, a++) {
+ bNodeInstanceKey key;
#ifdef USE_DRAW_TOT_UPDATE
/* unrelated to background nodes, update the v2d->tot,
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2013-03-22 13:53:58 UTC (rev 55508)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2013-03-22 14:31:03 UTC (rev 55509)
@@ -5742,10 +5742,10 @@
/* * motion tracking * */
-enum {
+enum transDataTracking_Mode {
transDataTracking_ModeTracks = 0,
- transDataTracking_ModeCurves = 1,
-} transDataTracking_Mode;
+ transDataTracking_ModeCurves = 1
+};
typedef struct TransDataTracking {
int mode, flag;
Modified: trunk/blender/source/blender/gpu/intern/gpu_simple_shader.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_simple_shader.c 2013-03-22 13:53:58 UTC (rev 55508)
+++ trunk/blender/source/blender/gpu/intern/gpu_simple_shader.c 2013-03-22 14:31:03 UTC (rev 55509)
@@ -56,7 +56,7 @@
/* State */
-#define NUM_OPENGL_LIGHTS 8
+// #define NUM_OPENGL_LIGHTS 8
static struct {
GPUShader *cached_shaders[GPU_SHADER_OPTION_COMBINATIONS];
Modified: trunk/blender/source/blender/python/intern/bpy.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy.c 2013-03-22 13:53:58 UTC (rev 55508)
+++ trunk/blender/source/blender/python/intern/bpy.c 2013-03-22 14:31:03 UTC (rev 55509)
@@ -27,8 +27,6 @@
* to access C defined builtin functions.
* A script writer should never directly access this module.
*/
-
-#define WITH_PYTHON /* for AUD_PyInit.h, possibly others */
#include <Python.h>
Modified: trunk/blender/source/blender/python/intern/bpy_app.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_app.c 2013-03-22 13:53:58 UTC (rev 55508)
+++ trunk/blender/source/blender/python/intern/bpy_app.c 2013-03-22 14:31:03 UTC (rev 55509)
@@ -107,9 +107,10 @@
if (app_info == NULL) {
return NULL;
}
-
+#if 0
#define SetIntItem(flag) \
PyStructSequence_SET_ITEM(app_info, pos++, PyLong_FromLong(flag))
+#endif
#define SetStrItem(str) \
PyStructSequence_SET_ITEM(app_info, pos++, PyUnicode_FromString(str))
#define SetBytesItem(str) \
Modified: trunk/blender/source/blender/python/intern/gpu.c
===================================================================
--- trunk/blender/source/blender/python/intern/gpu.c 2013-03-22 13:53:58 UTC (rev 55508)
+++ trunk/blender/source/blender/python/intern/gpu.c 2013-03-22 14:31:03 UTC (rev 55509)
@@ -131,6 +131,7 @@
PyDict_SetItemString(d, # f, val); \
Py_DECREF(val)
+#if 0 /* UNUSED */
#define PY_OBJ_ADD_ID(d, s, f) \
val = PyUnicode_FromString(&s->f->id.name[2]); \
PyObject_SetAttrString(d, # f, val); \
@@ -145,6 +146,7 @@
val = PyUnicode_FromString(s->f); \
PyObject_SetAttrString(d, # f, val); \
Py_DECREF(val)
+#endif
PyDoc_STRVAR(GPU_export_shader_doc,
"export_shader(scene, material)\n"
Modified: trunk/blender/source/gameengine/Converter/BL_ModifierDeformer.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ModifierDeformer.cpp 2013-03-22 13:53:58 UTC (rev 55508)
+++ trunk/blender/source/gameengine/Converter/BL_ModifierDeformer.cpp 2013-03-22 14:31:03 UTC (rev 55509)
@@ -67,10 +67,6 @@
#include "BLI_blenlib.h"
#include "BLI_math.h"
-#define __NLA_DEFNORMALS
-//#undef __NLA_DEFNORMALS
-
-
BL_ModifierDeformer::~BL_ModifierDeformer()
{
if (m_dm) {
More information about the Bf-blender-cvs
mailing list