Cleanup
authorCampbell Barton <ideasman42@gmail.com>
Thu, 2 Apr 2015 04:55:43 +0000 (15:55 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 2 Apr 2015 05:12:33 +0000 (16:12 +1100)
source/blender/compositor/intern/COM_ExecutionSystem.cpp
source/blender/compositor/intern/COM_compositor.cpp
source/blender/editors/animation/keyframing.c
source/blender/editors/screen/screen_ops.c
source/blender/freestyle/intern/view_map/BoxGrid.cpp
source/blender/freestyle/intern/view_map/BoxGrid.h
source/blender/freestyle/intern/view_map/SphericalGrid.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp

index 0466fbedb0a0091a58c24ebc53c4296ef9e86477..2ed9e6187bac2abab7e74bc6c82363b7d8ceecc9 100644 (file)
@@ -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();
index 3348e7c73d888bd61561755a444eb24800575dad..ff601e6f58efe92b6eda2906e6fc4b18e29d0147 100644 (file)
@@ -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 */
index 68ef704272d6254a832e5329e73203dbf3148532..78509dd6079941df86dddb4d46d0404adc3f4db7 100644 (file)
@@ -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");
                        }
                }
        }
index 25571c00928c7d894743ca4c7dabd0b6a16eae41..2064555f27ef8a2b1bb370db3e094347d0198cd4 100644 (file)
@@ -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 */
index de60cc3812f504acde19dfb4338a6f6aedcbeba4..ae22a26ec9b35611aed785b42ed39f524aa1b9cd 100644 (file)
@@ -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();
index 0ef4ce37b114e5e412dfe5483943c8ee7171d872..b8e751d041dea9abd8172a982b18a4597474e1f9 100644 (file)
@@ -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) {
index fedd5767e32384e637013082be4c5aadda5734eb..10c88190cb35e337d26d6017350c3b46e44d9346 100644 (file)
@@ -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();
index 84916b45ebf65452a8e10ddc4b5db98dd3189173..412a0b823c79f151e8fff0b901552b20010bfcda 100644 (file)
@@ -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
index 074cbd9937e71ad6f74fbac5e2fff32b4a9b5647..18b25d340ddc02d5dc1e9eafef7a1f0a13f6ca3d 100644 (file)
@@ -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;