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.
This commit is contained in:
Campbell Barton 2013-09-05 19:56:49 +00:00
parent 5036d6b1dd
commit f6b37f34ec
20 changed files with 31 additions and 28 deletions

@ -820,7 +820,7 @@ void BlenderSync::sync_curves(Mesh *mesh, BL::Mesh b_mesh, BL::Object b_ob, bool
} }
/* add hair geometry to mesh */ /* add hair geometry to mesh */
if(primitive == CURVE_TRIANGLES){ if(primitive == CURVE_TRIANGLES) {
if(triangle_method == CURVE_CAMERA_TRIANGLES) if(triangle_method == CURVE_CAMERA_TRIANGLES)
ExportCurveTrianglePlanes(mesh, &CData, RotCam); ExportCurveTrianglePlanes(mesh, &CData, RotCam);
else { else {

@ -444,7 +444,7 @@ __device_inline bool bvh_cardinal_curve_intersect(KernelGlobals *kg, Intersectio
float tb = 2*(tdif.z - tg.z*(tdifz + gd*(tdifz*gd + or1))); float tb = 2*(tdif.z - tg.z*(tdifz + gd*(tdifz*gd + or1)));
float tc = dot(tdif,tdif) - tdifz * tdifz * (1 + gd*gd) - or1*or1 - 2*or1*tdifz*gd; float tc = dot(tdif,tdif) - tdifz * tdifz * (1 + gd*gd) - or1*or1 - 2*or1*tdifz*gd;
float td = tb*tb - 4*cyla*tc; float td = tb*tb - 4*cyla*tc;
if (td < 0.0f){ if (td < 0.0f) {
tree++; tree++;
level = tree & -tree; level = tree & -tree;
continue; continue;

@ -3164,7 +3164,7 @@ void BKE_tracking_refine_marker(MovieClip *clip, MovieTrackingTrack *track, Movi
BKE_movieclip_get_size(clip, &user, &frame_width, &frame_height); 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 * Usually tracking_context_get_reference_ibuf will return current frame
* if marker is keyframed, which is correct for normal tracking. But here * 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 *************************/ /*********************** 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. * 2D stabilization.
* *
* NOTE: frame number should be in clip space, not scene space * 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 * stabilization data and used for easy coordinate
* transformation. * 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. * used for OpenGL drawing directly.
*/ */
void BKE_tracking_stabilization_data_to_mat4(int width, int height, float aspect, void BKE_tracking_stabilization_data_to_mat4(int width, int height, float aspect,

@ -99,14 +99,15 @@ set(SRC
intern/voxel.c intern/voxel.c
intern/winstuff.c intern/winstuff.c
BLI_args.h
BLI_alloca.h BLI_alloca.h
BLI_args.h
BLI_array.h BLI_array.h
BLI_bitmap.h BLI_bitmap.h
BLI_blenlib.h BLI_blenlib.h
BLI_buffer.h
BLI_boxpack2d.h BLI_boxpack2d.h
BLI_buffer.h
BLI_callbacks.h BLI_callbacks.h
BLI_compiler_attrs.h
BLI_cpu.h BLI_cpu.h
BLI_dlrbTree.h BLI_dlrbTree.h
BLI_dynlib.h BLI_dynlib.h
@ -150,6 +151,7 @@ set(SRC
BLI_smallhash.h BLI_smallhash.h
BLI_sort.h BLI_sort.h
BLI_stack.h BLI_stack.h
BLI_strict_flags.h
BLI_string.h BLI_string.h
BLI_string_cursor_utf8.h BLI_string_cursor_utf8.h
BLI_string_utf8.h BLI_string_utf8.h

@ -222,7 +222,7 @@
* - skip BMO flag allocation, its not needed in many cases, this is fairly redundant to calc by default. * - 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) * - 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. * - 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. * - avoid string lookups for BMO slot lookups _especially_ when used in loops, this is very crappy.
* *
* *

@ -65,7 +65,7 @@ typedef struct BMHeader {
void *data; /* customdata layers */ void *data; /* customdata layers */
int index; /* notes: int index; /* notes:
* - Use BM_elem_index_get/set macros for index * - 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, * - Used for edge/vert/face, check BMesh.elem_index_dirty for valid index values,
* this is abused by various tools which set it dirty. * this is abused by various tools which set it dirty.
* - For loops this is used for sorting during tessellation. */ * - For loops this is used for sorting during tessellation. */

@ -857,7 +857,7 @@ std::vector<Object *> MeshImporter::get_all_users_of(Mesh *reference_mesh)
* *
* During import all materials have been assigned to Object. * During import all materials have been assigned to Object.
* Now we iterate over the imported objects and optimize * Now we iterate over the imported objects and optimize
* the assignements as follows: * the assignments as follows:
* *
* for each imported geometry: * for each imported geometry:
* if number of users is 1: * if number of users is 1:

@ -189,8 +189,8 @@ public:
BLI_assert(offset >= 0); BLI_assert(offset >= 0);
BLI_assert(offset < this->determineBufferSize() * COM_NUMBER_OF_CHANNELS); BLI_assert(offset < this->determineBufferSize() * COM_NUMBER_OF_CHANNELS);
BLI_assert(!(extend_x == COM_MB_CLIP && (x < m_rect.xmin || x >= m_rect.xmax)) 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))); !(extend_y == COM_MB_CLIP && (y < m_rect.ymin || y >= m_rect.ymax)));
#if 0 #if 0
/* always true */ /* always true */

@ -503,7 +503,8 @@ static void render_endjob(void *rjv)
* - sergey - * - sergey -
*/ */
if (rj->scene->r.layers.first != rj->scene->r.layers.last || if (rj->scene->r.layers.first != rj->scene->r.layers.last ||
rj->image_outdated) { rj->image_outdated)
{
void *lock; void *lock;
Image *ima = rj->image; Image *ima = rj->image;
ImBuf *ibuf = BKE_image_acquire_ibuf(ima, &rj->iuser, &lock); ImBuf *ibuf = BKE_image_acquire_ibuf(ima, &rj->iuser, &lock);

@ -883,8 +883,8 @@ static void delete_graph_keys(bAnimContext *ac)
/* Only delete curve too if it won't be doing anything anymore */ /* Only delete curve too if it won't be doing anything anymore */
if ((fcu->totvert == 0) && if ((fcu->totvert == 0) &&
(list_has_suitable_fmodifier(&fcu->modifiers, 0, FMI_TYPE_GENERATE_CURVE) == 0) && (list_has_suitable_fmodifier(&fcu->modifiers, 0, FMI_TYPE_GENERATE_CURVE) == 0) &&
(fcu->driver == NULL)) (fcu->driver == NULL))
{ {
ANIM_fcurve_delete_from_animdata(ac, adt, fcu); ANIM_fcurve_delete_from_animdata(ac, adt, fcu);
} }

@ -44,7 +44,7 @@ PyDoc_STRVAR(ViewEdge_doc,
"Class hierarchy: :class:`Interface1D` > :class:`ViewEdge`\n" "Class hierarchy: :class:`Interface1D` > :class:`ViewEdge`\n"
"\n" "\n"
"Class defining a ViewEdge. A ViewEdge in an edge of the image graph.\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" "a set of FEdges.\n"
"\n" "\n"
".. method:: __init__()\n" ".. method:: __init__()\n"

@ -48,7 +48,7 @@ static char MaterialF0D___doc__[] =
" evaluation can be ambiguous (in the case of a :class:`TVertex` for\n" " evaluation can be ambiguous (in the case of a :class:`TVertex` for\n"
" example. This functor tries to remove this ambiguity using the\n" " example. This functor tries to remove this ambiguity using the\n"
" context offered by the 1D element to which the Interface0DIterator\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" " 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" " different materials on each side of the point. However, there\n"
" still can be problematic cases, and the user willing to deal with\n" " still can be problematic cases, and the user willing to deal with\n"

@ -47,7 +47,7 @@ static char ZDiscontinuityF0D___doc__[] =
" :class:`Interface0D` pointed by the Interface0DIterator and the\n" " :class:`Interface0D` pointed by the Interface0DIterator and the\n"
" shape that lies behind (occludee). This distance is evaluated in\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" " 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" " 1 is returned.\n"
"\n" "\n"
" :arg it: An Interface0DIterator object.\n" " :arg it: An Interface0DIterator object.\n"

@ -52,7 +52,7 @@ static char ZDiscontinuityF1D___doc__[] =
" Returns a real value giving the distance between an Interface1D\n" " Returns a real value giving the distance between an Interface1D\n"
" and the shape that lies behind (occludee). This distance is\n" " and the shape that lies behind (occludee). This distance is\n"
" evaluated in the camera space and normalized between 0 and 1.\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" " Interface1D belongs to, 1 is returned.\n"
"\n" "\n"
" :arg inter: An Interface1D object.\n" " :arg inter: An Interface1D object.\n"

@ -346,7 +346,7 @@ public:
// ZDiscontinuity // ZDiscontinuity
/*! Returns a real giving the distance between and Interface0D and the shape that lies behind (occludee). /*! 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. * by the shape to which the Interface0D belongs to, 1 is returned.
*/ */
class LIB_VIEW_MAP_EXPORT ZDiscontinuityF0D : public UnaryFunction0D<real> class LIB_VIEW_MAP_EXPORT ZDiscontinuityF0D : public UnaryFunction0D<real>
@ -383,7 +383,7 @@ public:
/*! Returns the material of the object evaluated at the Interface0D. /*! Returns the material of the object evaluated at the Interface0D.
* This evaluation can be ambiguous (in the case of a TVertex for example. * 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 * 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. * 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 * 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. * should implement its own getMaterial functor.

@ -377,7 +377,7 @@ public:
// ZDiscontinuityF1D // ZDiscontinuityF1D
/*! Returns a real giving the distance between and Interface1D and the shape that lies behind (occludee). /*! 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. * by the shape to which the Interface1D belongs to, 1 is returned.
*/ */
class LIB_VIEW_MAP_EXPORT ZDiscontinuityF1D : public UnaryFunction1D<real> class LIB_VIEW_MAP_EXPORT ZDiscontinuityF1D : public UnaryFunction1D<real>

@ -89,7 +89,7 @@ public:
/*! Returns the number of the SVM to which a FEdge belongs most. /*! Returns the number of the SVM to which a FEdge belongs most.
* \param id * \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); unsigned getSVMNumber(unsigned id);

@ -888,7 +888,7 @@ template<class Traits> class vertex_iterator_base;
} // end of namespace ViewEdgeInternal } // 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. * It is made by connecting a set of FEdges.
*/ */
class LIB_VIEW_MAP_EXPORT ViewEdge : public Interface1D class LIB_VIEW_MAP_EXPORT ViewEdge : public Interface1D

@ -34,6 +34,8 @@
#include "rna_internal.h" #include "rna_internal.h"
#ifdef RNA_RUNTIME
#define ARRAY_SIZE 3 #define ARRAY_SIZE 3
#define DYNAMIC_ARRAY_SIZE 64 #define DYNAMIC_ARRAY_SIZE 64
#define MARRAY_DIM [3][4][5] #define MARRAY_DIM [3][4][5]
@ -43,8 +45,6 @@
#define DYNAMIC_MARRAY_DIM [3][4][5] #define DYNAMIC_MARRAY_DIM [3][4][5]
#define DYNAMIC_MARRAY_SIZE(type) (sizeof(type DYNAMIC_MARRAY_DIM) / sizeof(type)) #define DYNAMIC_MARRAY_SIZE(type) (sizeof(type DYNAMIC_MARRAY_DIM) / sizeof(type))
#ifdef RNA_RUNTIME
#ifdef UNIT_TEST #ifdef UNIT_TEST
#define DEF_VARS(type, prefix) \ #define DEF_VARS(type, prefix) \

@ -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); 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 */ * 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)) static void wm_block_splash_refreshmenu(bContext *UNUSED(C), void *UNUSED(arg_block), void *UNUSED(arg))
{ {