From f6b37f34ec2593b12b67046cf032acc202e2fa54 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 5 Sep 2013 19:56:49 +0000 Subject: code cleanup: - add missing headers from cmake (own omission) - quiet rna_test.c unused define warnings. - minor style edits - spelling corrections and ignore all uppercase words with spell checking script. --- source/blender/blenkernel/intern/tracking.c | 6 +++--- source/blender/blenlib/CMakeLists.txt | 6 ++++-- source/blender/bmesh/bmesh.h | 2 +- source/blender/bmesh/bmesh_class.h | 2 +- source/blender/collada/MeshImporter.cpp | 2 +- source/blender/compositor/intern/COM_MemoryBuffer.h | 4 ++-- source/blender/editors/render/render_internal.c | 3 ++- source/blender/editors/space_graph/graph_edit.c | 6 +++--- source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp | 2 +- .../UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp | 2 +- .../UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp | 2 +- .../UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp | 2 +- source/blender/freestyle/intern/view_map/Functions0D.h | 4 ++-- source/blender/freestyle/intern/view_map/Functions1D.h | 2 +- source/blender/freestyle/intern/view_map/SteerableViewMap.h | 2 +- source/blender/freestyle/intern/view_map/ViewMap.h | 2 +- source/blender/makesrna/intern/rna_test.c | 4 ++-- source/blender/windowmanager/intern/wm_operators.c | 2 +- 18 files changed, 29 insertions(+), 26 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 5e09ba8d4d7..19c1bf9b8a8 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -3164,7 +3164,7 @@ void BKE_tracking_refine_marker(MovieClip *clip, MovieTrackingTrack *track, Movi BKE_movieclip_get_size(clip, &user, &frame_width, &frame_height); - /* Get an image buffer for reference frame, also gets referecnce marker. + /* Get an image buffer for reference frame, also gets reference marker. * * Usually tracking_context_get_reference_ibuf will return current frame * if marker is keyframed, which is correct for normal tracking. But here @@ -4057,7 +4057,7 @@ void BKE_tracking_detect_fast(MovieTracking *tracking, ListBase *tracksbase, ImB /*********************** 2D stabilization *************************/ -/* Claculate median point of markers of tracks marked as used for +/* Calculate median point of markers of tracks marked as used for * 2D stabilization. * * NOTE: frame number should be in clip space, not scene space @@ -4414,7 +4414,7 @@ ImBuf *BKE_tracking_stabilize_frame(MovieTracking *tracking, int framenr, ImBuf * stabilization data and used for easy coordinate * transformation. * - * NOTE: The reaosn it is 4x4 matrix is because it's + * NOTE: The reason it is 4x4 matrix is because it's * used for OpenGL drawing directly. */ void BKE_tracking_stabilization_data_to_mat4(int width, int height, float aspect, diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 9ca56d60593..c5e2c0b298b 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -99,14 +99,15 @@ set(SRC intern/voxel.c intern/winstuff.c - BLI_args.h BLI_alloca.h + BLI_args.h BLI_array.h BLI_bitmap.h BLI_blenlib.h - BLI_buffer.h BLI_boxpack2d.h + BLI_buffer.h BLI_callbacks.h + BLI_compiler_attrs.h BLI_cpu.h BLI_dlrbTree.h BLI_dynlib.h @@ -150,6 +151,7 @@ set(SRC BLI_smallhash.h BLI_sort.h BLI_stack.h + BLI_strict_flags.h BLI_string.h BLI_string_cursor_utf8.h BLI_string_utf8.h diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h index 985904b0bec..7905a57633e 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.h @@ -222,7 +222,7 @@ * - skip BMO flag allocation, its not needed in many cases, this is fairly redundant to calc by default. * - ability to call BMO's with option not to create return data (will save some time) * - binary diff UNDO, currently this uses huge amount of ram when all shapes are stored for each undo step for eg. - * - use two differnt iterator types for BMO map/buffer types. + * - use two different iterator types for BMO map/buffer types. * - avoid string lookups for BMO slot lookups _especially_ when used in loops, this is very crappy. * * diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h index 23e5c970823..5b79bd78061 100644 --- a/source/blender/bmesh/bmesh_class.h +++ b/source/blender/bmesh/bmesh_class.h @@ -65,7 +65,7 @@ typedef struct BMHeader { void *data; /* customdata layers */ int index; /* notes: * - Use BM_elem_index_get/set macros for index - * - Unitialized to -1 so we can easily tell its not set. + * - Uninitialized to -1 so we can easily tell its not set. * - Used for edge/vert/face, check BMesh.elem_index_dirty for valid index values, * this is abused by various tools which set it dirty. * - For loops this is used for sorting during tessellation. */ diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 8aa68ed9d04..0c46a2bd858 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -857,7 +857,7 @@ std::vector MeshImporter::get_all_users_of(Mesh *reference_mesh) * * During import all materials have been assigned to Object. * Now we iterate over the imported objects and optimize - * the assignements as follows: + * the assignments as follows: * * for each imported geometry: * if number of users is 1: diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h index d02011f0900..548744f6660 100644 --- a/source/blender/compositor/intern/COM_MemoryBuffer.h +++ b/source/blender/compositor/intern/COM_MemoryBuffer.h @@ -189,8 +189,8 @@ public: BLI_assert(offset >= 0); BLI_assert(offset < this->determineBufferSize() * COM_NUMBER_OF_CHANNELS); - BLI_assert(!(extend_x == COM_MB_CLIP && (x < m_rect.xmin || x >= m_rect.xmax)) - && !(extend_y == COM_MB_CLIP && (y < m_rect.ymin || y >= m_rect.ymax))); + BLI_assert(!(extend_x == COM_MB_CLIP && (x < m_rect.xmin || x >= m_rect.xmax)) && + !(extend_y == COM_MB_CLIP && (y < m_rect.ymin || y >= m_rect.ymax))); #if 0 /* always true */ diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 188e2b5624b..0d6e6fb5ac1 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -503,7 +503,8 @@ static void render_endjob(void *rjv) * - sergey - */ if (rj->scene->r.layers.first != rj->scene->r.layers.last || - rj->image_outdated) { + rj->image_outdated) + { void *lock; Image *ima = rj->image; ImBuf *ibuf = BKE_image_acquire_ibuf(ima, &rj->iuser, &lock); diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 7a36cd98c2c..5546682e470 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -882,9 +882,9 @@ static void delete_graph_keys(bAnimContext *ac) delete_fcurve_keys(fcu); /* Only delete curve too if it won't be doing anything anymore */ - if ((fcu->totvert == 0) && - (list_has_suitable_fmodifier(&fcu->modifiers, 0, FMI_TYPE_GENERATE_CURVE) == 0) && - (fcu->driver == NULL)) + if ((fcu->totvert == 0) && + (list_has_suitable_fmodifier(&fcu->modifiers, 0, FMI_TYPE_GENERATE_CURVE) == 0) && + (fcu->driver == NULL)) { ANIM_fcurve_delete_from_animdata(ac, adt, fcu); } diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp index 9b915df03d1..869ada0d058 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp @@ -44,7 +44,7 @@ PyDoc_STRVAR(ViewEdge_doc, "Class hierarchy: :class:`Interface1D` > :class:`ViewEdge`\n" "\n" "Class defining a ViewEdge. A ViewEdge in an edge of the image graph.\n" -"it connnects two :class:`ViewVertex` objects. It is made by connecting\n" +"it connects two :class:`ViewVertex` objects. It is made by connecting\n" "a set of FEdges.\n" "\n" ".. method:: __init__()\n" diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp index 18815ab6f62..b54ed48edc3 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp @@ -48,7 +48,7 @@ static char MaterialF0D___doc__[] = " evaluation can be ambiguous (in the case of a :class:`TVertex` for\n" " example. This functor tries to remove this ambiguity using the\n" " context offered by the 1D element to which the Interface0DIterator\n" -" belongs to and by arbitrary chosing the material of the face that\n" +" belongs to and by arbitrary choosing the material of the face that\n" " lies on its left when following the 1D element if there are two\n" " different materials on each side of the point. However, there\n" " still can be problematic cases, and the user willing to deal with\n" diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp index 8f7fccb5293..b64f6c06e93 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp @@ -47,7 +47,7 @@ static char ZDiscontinuityF0D___doc__[] = " :class:`Interface0D` pointed by the Interface0DIterator and the\n" " shape that lies behind (occludee). This distance is evaluated in\n" " the camera space and normalized between 0 and 1. Therefore, if no\n" -" oject is occluded by the shape to which the Interface0D belongs to,\n" +" object is occluded by the shape to which the Interface0D belongs to,\n" " 1 is returned.\n" "\n" " :arg it: An Interface0DIterator object.\n" diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp index 5c3dc3eed9f..65fde596e23 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp @@ -52,7 +52,7 @@ static char ZDiscontinuityF1D___doc__[] = " Returns a real value giving the distance between an Interface1D\n" " and the shape that lies behind (occludee). This distance is\n" " evaluated in the camera space and normalized between 0 and 1.\n" -" Therefore, if no oject is occluded by the shape to which the\n" +" Therefore, if no object is occluded by the shape to which the\n" " Interface1D belongs to, 1 is returned.\n" "\n" " :arg inter: An Interface1D object.\n" diff --git a/source/blender/freestyle/intern/view_map/Functions0D.h b/source/blender/freestyle/intern/view_map/Functions0D.h index 69f6f42e022..e9474191319 100644 --- a/source/blender/freestyle/intern/view_map/Functions0D.h +++ b/source/blender/freestyle/intern/view_map/Functions0D.h @@ -346,7 +346,7 @@ public: // ZDiscontinuity /*! Returns a real giving the distance between and Interface0D and the shape that lies behind (occludee). - * This distance is evaluated in the camera space and normalized between 0 and 1. Therefore, if no oject is occluded + * This distance is evaluated in the camera space and normalized between 0 and 1. Therefore, if no object is occluded * by the shape to which the Interface0D belongs to, 1 is returned. */ class LIB_VIEW_MAP_EXPORT ZDiscontinuityF0D : public UnaryFunction0D @@ -383,7 +383,7 @@ public: /*! Returns the material of the object evaluated at the Interface0D. * This evaluation can be ambiguous (in the case of a TVertex for example. * This functor tries to remove this ambiguity using the context offered by the 1D element to which the - * Interface0DIterator& belongs to and by arbitrary chosing the material of the face that lies on its left when + * Interface0DIterator& belongs to and by arbitrary choosing the material of the face that lies on its left when * following the 1D element if there are two different materials on each side of the point. * However, there still can be problematic cases, and the user willing to deal with this cases in a specific way * should implement its own getMaterial functor. diff --git a/source/blender/freestyle/intern/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h index 2d3da151d13..7b10d1b5185 100644 --- a/source/blender/freestyle/intern/view_map/Functions1D.h +++ b/source/blender/freestyle/intern/view_map/Functions1D.h @@ -377,7 +377,7 @@ public: // ZDiscontinuityF1D /*! Returns a real giving the distance between and Interface1D and the shape that lies behind (occludee). - * This distance is evaluated in the camera space and normalized between 0 and 1. Therefore, if no oject is occluded + * This distance is evaluated in the camera space and normalized between 0 and 1. Therefore, if no object is occluded * by the shape to which the Interface1D belongs to, 1 is returned. */ class LIB_VIEW_MAP_EXPORT ZDiscontinuityF1D : public UnaryFunction1D diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.h b/source/blender/freestyle/intern/view_map/SteerableViewMap.h index 23681b43c48..581155fa6e8 100644 --- a/source/blender/freestyle/intern/view_map/SteerableViewMap.h +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.h @@ -89,7 +89,7 @@ public: /*! Returns the number of the SVM to which a FEdge belongs most. * \param id - * The First element of the Id struct of the FEdge we're intersted in. + * The First element of the Id struct of the FEdge we're interested in. */ unsigned getSVMNumber(unsigned id); diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h index 987a5bda9b3..0ab089b7d7a 100644 --- a/source/blender/freestyle/intern/view_map/ViewMap.h +++ b/source/blender/freestyle/intern/view_map/ViewMap.h @@ -888,7 +888,7 @@ template class vertex_iterator_base; } // end of namespace ViewEdgeInternal -/*! Class defining a ViewEdge. A ViewEdge in an edge of the image graph. it connnects two ViewVertex. +/*! Class defining a ViewEdge. A ViewEdge in an edge of the image graph. it connects two ViewVertex. * It is made by connecting a set of FEdges. */ class LIB_VIEW_MAP_EXPORT ViewEdge : public Interface1D diff --git a/source/blender/makesrna/intern/rna_test.c b/source/blender/makesrna/intern/rna_test.c index 22b6f323647..e54e5f9bcad 100644 --- a/source/blender/makesrna/intern/rna_test.c +++ b/source/blender/makesrna/intern/rna_test.c @@ -34,6 +34,8 @@ #include "rna_internal.h" +#ifdef RNA_RUNTIME + #define ARRAY_SIZE 3 #define DYNAMIC_ARRAY_SIZE 64 #define MARRAY_DIM [3][4][5] @@ -43,8 +45,6 @@ #define DYNAMIC_MARRAY_DIM [3][4][5] #define DYNAMIC_MARRAY_SIZE(type) (sizeof(type DYNAMIC_MARRAY_DIM) / sizeof(type)) -#ifdef RNA_RUNTIME - #ifdef UNIT_TEST #define DEF_VARS(type, prefix) \ diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index ad764cda853..62b29266c5c 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1563,7 +1563,7 @@ static void wm_block_splash_close(bContext *C, void *arg_block, void *UNUSED(arg static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *arg_unused); -/* XXX: hack to refresh splash screen with updated prest menu name, +/* XXX: hack to refresh splash screen with updated preset menu name, * since popup blocks don't get regenerated like panels do */ static void wm_block_splash_refreshmenu(bContext *UNUSED(C), void *UNUSED(arg_block), void *UNUSED(arg)) { -- cgit v1.2.3