From 77667ad80f39e608d625ddae07914a9f42a4ed86 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 2 Apr 2015 15:55:43 +1100 Subject: Cleanup --- source/blender/compositor/intern/COM_ExecutionSystem.cpp | 4 ++-- source/blender/compositor/intern/COM_compositor.cpp | 2 +- source/blender/editors/animation/keyframing.c | 3 ++- source/blender/editors/screen/screen_ops.c | 4 ++-- source/blender/freestyle/intern/view_map/BoxGrid.cpp | 4 ++-- source/blender/freestyle/intern/view_map/BoxGrid.h | 4 ++-- source/blender/freestyle/intern/view_map/SphericalGrid.cpp | 4 ++-- source/gameengine/Ketsji/KX_GameObject.cpp | 4 ++-- source/gameengine/Ketsji/KX_PythonInit.cpp | 4 ++-- 9 files changed, 17 insertions(+), 16 deletions(-) (limited to 'source') diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cpp b/source/blender/compositor/intern/COM_ExecutionSystem.cpp index 0466fbedb0a..2ed9e6187ba 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.cpp +++ b/source/blender/compositor/intern/COM_ExecutionSystem.cpp @@ -127,7 +127,7 @@ void ExecutionSystem::set_operations(const Operations &operations, const Groups void ExecutionSystem::execute() { const bNodeTree *editingtree = this->m_context.getbNodeTree(); - editingtree->stats_draw(editingtree->sdh, (char*)"Compositing | Initializing execution"); + editingtree->stats_draw(editingtree->sdh, (char *)"Compositing | Initializing execution"); DebugInfo::execute_started(this); @@ -183,7 +183,7 @@ void ExecutionSystem::execute() WorkScheduler::finish(); WorkScheduler::stop(); - editingtree->stats_draw(editingtree->sdh, (char*)"Compositing | Deinitializing execution"); + editingtree->stats_draw(editingtree->sdh, (char *)"Compositing | Deinitializing execution"); for (index = 0; index < this->m_operations.size(); index++) { NodeOperation *operation = this->m_operations[index]; operation->deinitExecution(); diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp index 3348e7c73d8..ff601e6f58e 100644 --- a/source/blender/compositor/intern/COM_compositor.cpp +++ b/source/blender/compositor/intern/COM_compositor.cpp @@ -77,7 +77,7 @@ void COM_execute(RenderData *rd, Scene *scene, bNodeTree *editingtree, int rende /* set progress bar to 0% and status to init compositing */ editingtree->progress(editingtree->prh, 0.0); - editingtree->stats_draw(editingtree->sdh, (char*)"Compositing"); + editingtree->stats_draw(editingtree->sdh, (char *)"Compositing"); bool twopass = (editingtree->flag & NTREE_TWO_PASS) > 0 && !rendering; /* initialize execution system */ diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 68ef704272d..78509dd6079 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -1738,7 +1738,8 @@ static int insert_key_button_exec(bContext *C, wmOperator *op) } else { BKE_report(op->reports, RPT_WARNING, - "Failed to resolve path to property, try manually specifying this using a Keying Set instead"); + "Failed to resolve path to property, " + "try manually specifying this using a Keying Set instead"); } } } diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 25571c00928..2064555f27e 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3531,9 +3531,9 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv if (sad->flag & ANIMPLAY_FLAG_JUMPED) { BKE_sound_seek_scene(bmain, scene); - #ifdef PROFILE_AUDIO_SYNCH +#ifdef PROFILE_AUDIO_SYNCH old_frame = CFRA; - #endif +#endif } /* since we follow drawflags, we can't send notifier but tag regions ourselves */ diff --git a/source/blender/freestyle/intern/view_map/BoxGrid.cpp b/source/blender/freestyle/intern/view_map/BoxGrid.cpp index de60cc3812f..ae22a26ec9b 100644 --- a/source/blender/freestyle/intern/view_map/BoxGrid.cpp +++ b/source/blender/freestyle/intern/view_map/BoxGrid.cpp @@ -76,13 +76,13 @@ BoxGrid::Iterator::Iterator (BoxGrid& grid, Vec3r& center, real /*epsilon*/) { // Find target cell _cell = grid.findCell(_target); - #if BOX_GRID_LOGGING +#if BOX_GRID_LOGGING if (G.debug & G_DEBUG_FREESTYLE) { cout << "Searching for occluders of edge centered at " << _target << " in cell [" << 1_cell->boundary[0] << ", " << _cell->boundary[1] << ", " << _cell->boundary[2] << ", " << _cell->boundary[3] << "] (" << _cell->faces.size() << " occluders)" << endl; } - #endif +#endif // Set iterator _current = _cell->faces.begin(); diff --git a/source/blender/freestyle/intern/view_map/BoxGrid.h b/source/blender/freestyle/intern/view_map/BoxGrid.h index 0ef4ce37b11..b8e751d041d 100644 --- a/source/blender/freestyle/intern/view_map/BoxGrid.h +++ b/source/blender/freestyle/intern/view_map/BoxGrid.h @@ -303,11 +303,11 @@ inline void BoxGrid::Iterator::reportDepth(Vec3r origin, Vec3r u, real t) // The reported depth is the length of a ray in camera space // We need to convert it into a Z-value in grid space real depth = -(origin + (u * t))[2]; - #if BOX_GRID_LOGGING +#if BOX_GRID_LOGGING if (G.debug & G_DEBUG_FREESTYLE) { std::cout << "\t\tReporting depth of occluder/ee: " << depth; } - #endif +#endif if (depth > _target[2]) { #if BOX_GRID_LOGGING if (G.debug & G_DEBUG_FREESTYLE) { diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.cpp b/source/blender/freestyle/intern/view_map/SphericalGrid.cpp index fedd5767e32..10c88190cb3 100644 --- a/source/blender/freestyle/intern/view_map/SphericalGrid.cpp +++ b/source/blender/freestyle/intern/view_map/SphericalGrid.cpp @@ -77,13 +77,13 @@ SphericalGrid::Iterator::Iterator(SphericalGrid& grid, Vec3r& center, real /*eps { // Find target cell _cell = grid.findCell(_target); - #if SPHERICAL_GRID_LOGGING +#if SPHERICAL_GRID_LOGGING if (G.debug & G_DEBUG_FREESTYLE) { cout << "Searching for occluders of edge centered at " << _target << " in cell [" << _cell->boundary[0] << ", " << _cell->boundary[1] << ", " << _cell->boundary[2] << ", " << _cell->boundary[3] << "] (" << _cell->faces.size() << " occluders)" << endl; } - #endif +#endif // Set iterator _current = _cell->faces.begin(); diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index 84916b45ebf..412a0b823c7 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -1550,7 +1550,7 @@ void KX_GameObject::RegisterCollisionCallbacks() } void KX_GameObject::RunCollisionCallbacks(KX_GameObject *collider, const MT_Vector3 &point, const MT_Vector3 &normal) { - #ifdef WITH_PYTHON +#ifdef WITH_PYTHON Py_ssize_t len; PyObject* collision_callbacks = m_collisionCallbacks; @@ -1613,7 +1613,7 @@ void KX_GameObject::RunCollisionCallbacks(KX_GameObject *collider, const MT_Vect if (args_3) Py_DECREF(args_3); if (args_1) Py_DECREF(args_1); } - #endif +#endif } /* Suspend/ resume: for the dynamic behavior, there is a simple diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 074cbd9937e..18b25d340dd 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -2057,14 +2057,14 @@ PyObject *initGamePlayerPythonScripting(Main *maggie, int argc, char** argv) Py_SetProgramName(program_path_wchar); /* Update, Py3.3 resolves attempting to parse non-existing header */ - #if 0 +#if 0 /* Python 3.2 now looks for '2.xx/python/include/python3.2d/pyconfig.h' to * parse from the 'sysconfig' module which is used by 'site', * so for now disable site. alternatively we could copy the file. */ if (py_path_bundle != NULL) { Py_NoSiteFlag = 1; /* inhibits the automatic importing of 'site' */ } - #endif +#endif Py_FrozenFlag = 1; -- cgit v1.2.3