diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-11-22 04:30:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-11-22 04:30:40 +0400 |
| commit | d4a11388bf988b9377b19269abf2f0632ddd1fd5 (patch) | |
| tree | ba1f1041558b50a845f46adef4f8cdac7f2d168c /source/blender | |
| parent | a5183d7a87b3b7cad50b47d7bda24efbeddcade7 (diff) | |
Code Cleanup: warnings
Diffstat (limited to 'source/blender')
4 files changed, 8 insertions, 13 deletions
diff --git a/source/blender/bmesh/tools/bmesh_beautify.c b/source/blender/bmesh/tools/bmesh_beautify.c index 1a1201c015e..cad5e1beeff 100644 --- a/source/blender/bmesh/tools/bmesh_beautify.c +++ b/source/blender/bmesh/tools/bmesh_beautify.c @@ -309,8 +309,6 @@ static void bm_edge_update_beauty_cost_single(BMEdge *e, Heap *eheap, HeapNode * /* check if we can add it back */ BLI_assert(BM_edge_is_manifold(e) == true); - //BLI_assert(BMO_elem_flag_test(bm, e->l->f, FACE_MARK) && - // BMO_elem_flag_test(bm, e->l->radial_next->f, FACE_MARK)); /* check we're not moving back into a state we have been in before */ if (e_state_set != NULL) { @@ -354,9 +352,6 @@ static void bm_edge_update_beauty_cost(BMEdge *e, Heap *eheap, HeapNode **eheap_ /* -------------------------------------------------------------------- */ /* Beautify Fill */ -#define ELE_NEW 1 -#define FACE_MARK 2 - /** * \note All edges in \a edge_array must be tagged and * have their index values set according to their position in the array. diff --git a/source/blender/compositor/intern/COM_SocketReader.h b/source/blender/compositor/intern/COM_SocketReader.h index 2eaeb664c67..2168611d0c0 100644 --- a/source/blender/compositor/intern/COM_SocketReader.h +++ b/source/blender/compositor/intern/COM_SocketReader.h @@ -102,11 +102,11 @@ public: } virtual void *initializeTileData(rcti *rect) { return 0; } - virtual void deinitializeTileData(rcti *rect, void *data) { - } - - virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers) { return 0; } + virtual void deinitializeTileData(rcti *rect, void *data) {} + virtual ~SocketReader() {} + + virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers) { return 0; } inline const unsigned int getWidth() const { return this->m_width; } inline const unsigned int getHeight() const { return this->m_height; } diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp index 330e61e7fea..57e996fe3b2 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cpp +++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp @@ -77,9 +77,9 @@ static bool g_openclInitialized = false; #define MAX_HIGHLIGHT 8 static bool g_highlightInitialized = false; extern "C" { -int g_highlightIndex; -void **g_highlightedNodes; -void **g_highlightedNodesRead; +static int g_highlightIndex; +static void **g_highlightedNodes; +static void **g_highlightedNodesRead; #if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE #define HIGHLIGHT(wp) \ diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp index a8c7728160d..bc792244dcb 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp @@ -29,7 +29,7 @@ extern "C" { } -vector<DistortionCache *> s_cache; +static vector<DistortionCache *> s_cache; void deintializeDistortionCache(void) { |