From 4c2de5e0c78ff4ec2a0ac9d8d3535d00d72b4f2a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 26 Jul 2012 17:41:09 +0000 Subject: [PATCH] fix some types and incorrect info --- intern/ghost/intern/GHOST_SystemX11.cpp | 2 +- intern/ghost/intern/GHOST_Window.h | 2 +- intern/itasc/kdl/utilities/utility_io.cpp | 4 ++-- intern/memutil/MEM_RefCountPtr.h | 2 +- source/blender/blenkernel/intern/brush.c | 2 +- source/blender/blenkernel/intern/softbody.c | 4 ++-- source/blender/blenkernel/intern/tracking.c | 2 +- source/blender/blenlib/intern/freetypefont.c | 2 +- source/blender/editors/space_image/image_ops.c | 9 +++++---- source/blender/editors/transform/transform_conversions.c | 2 +- source/blender/makesdna/DNA_ID.h | 2 +- source/blender/makesrna/intern/rna_rna.c | 2 +- source/blender/makesrna/intern/rna_scene.c | 6 +++--- source/blender/modifiers/intern/MOD_boolean.c | 2 +- source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp | 2 +- source/gameengine/Rasterizer/RAS_FramingManager.h | 2 +- 16 files changed, 24 insertions(+), 23 deletions(-) diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index eccfc18eef9..e8f172f8b1c 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -1479,7 +1479,7 @@ void GHOST_SystemX11::getClipboard_xcout(XEvent evt, XFree(buffer); - /* if we have come this far, the propery contains + /* if we have come this far, the property contains * text, we know the size. */ XGetWindowProperty(m_display, win, m_xclip_out, 0, (long) pty_size, False, AnyPropertyType, &pty_type, &pty_format, diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h index 91a974bde19..10a6a57b9fe 100644 --- a/intern/ghost/intern/GHOST_Window.h +++ b/intern/ghost/intern/GHOST_Window.h @@ -335,7 +335,7 @@ protected: /** Modified state : are there unsaved changes */ bool m_isUnsavedChanges; - /** Stores wether this is a full screen window. */ + /** Stores whether this is a full screen window. */ bool m_fullScreen; /** Stereo visual created. Only necessary for 'real' stereo support, diff --git a/intern/itasc/kdl/utilities/utility_io.cpp b/intern/itasc/kdl/utilities/utility_io.cpp index 0926f424f71..e16a85167bc 100644 --- a/intern/itasc/kdl/utilities/utility_io.cpp +++ b/intern/itasc/kdl/utilities/utility_io.cpp @@ -106,7 +106,7 @@ int _EatSpace( std::istream& is,int* countp=NULL) { // Eats whites, returns, tabs and the delim character -// Checks wether delim char. is encountered. +// Checks whether delim char. is encountered. void Eat( std::istream& is, int delim ) { int ch; @@ -119,7 +119,7 @@ void Eat( std::istream& is, int delim ) } // Eats whites, returns, tabs and the delim character -// Checks wether delim char. is encountered. +// Checks whether delim char. is encountered. // EatEnd does not eat all space-like char's at the end. void EatEnd( std::istream& is, int delim ) { diff --git a/intern/memutil/MEM_RefCountPtr.h b/intern/memutil/MEM_RefCountPtr.h index ffdf927b551..da10e689fbf 100644 --- a/intern/memutil/MEM_RefCountPtr.h +++ b/intern/memutil/MEM_RefCountPtr.h @@ -130,7 +130,7 @@ protected : /** * Protected constructors - * This class is not for direct instanciation. Sub classes + * This class is not for direct instantiation. Sub classes * should only be allocated on the heap. */ diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 53a9057116c..f54e6595fe6 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -1066,7 +1066,7 @@ void BKE_brush_jitter_pos(const Scene *scene, Brush *brush, const float pos[2], int use_jitter = brush->jitter != 0; /* jitter-ed brush gives weird and unpredictable result for this - * kinds of stroke, so manyally disable jitter usage (sergey) */ + * kinds of stroke, so manually disable jitter usage (sergey) */ use_jitter &= (brush->flag & (BRUSH_RESTORE_MESH | BRUSH_ANCHORED)) == 0; if (use_jitter) { diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 2c105e4940d..26ca3805c28 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -3309,7 +3309,7 @@ static void mesh_to_softbody(Scene *scene, Object *ob) if (ob->softflag & OB_SB_GOAL) {bp->goal = sb->defgoal;} } - /* to proove the concept + /* to proof the concept * this enables per vertex *mass painting* */ @@ -3798,7 +3798,7 @@ static void softbody_update_positions(Object *ob, SoftBody *sb, float (*vertexCo /* vertexCos came from local world, go global */ mul_m4_v3(ob->obmat, bp->origE); /* just to be save give bp->origT a defined value - * will be calulated in interpolate_exciter()*/ + * will be calculated in interpolate_exciter() */ copy_v3_v3(bp->origT, bp->origE); } } diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 4342eb20d55..35a688849e8 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -853,7 +853,7 @@ static void track_mask_gpencil_layer_rasterize(int frame_width, int frame_height fp[1] = (stroke_points[i].y - marker->search_min[1]) * frame_height / mask_height; } - /* TODO: add an option to control wether AA is enabled or not */ + /* TODO: add an option to control whether AA is enabled or not */ PLX_raskterize((float (*)[2])mask_points, stroke->totpoints, mask, mask_width, mask_height, FALSE); MEM_freeN(mask_points); diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index 6ce8b9ecf91..774e37a8476 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -556,7 +556,7 @@ typedef struct FT_Outline_ * Type1 format. * * Each arc is described through a series of start, end and control points. Each point of the outline - * has a specific tag which indicates wether it is used to describe a line segment or an arc. + * has a specific tag which indicates whether it is used to describe a line segment or an arc. * * * The following rules are applied to decompose the contour's points into segments and arcs : diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 95e43e2ab24..4626600f2cf 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -914,12 +914,13 @@ static int image_open_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event) if (prop) { PointerRNA oldptr; + Image *oldima; oldptr = RNA_property_pointer_get(&ptr, prop); - ima = (Image *)oldptr.id.data; - /* unlikely but better avoid strange crash */ - if (ima && GS(ima->id.name) != ID_IM) { - ima = NULL; + oldima = (Image *)oldptr.id.data; + /* unlikely to fail but better avoid strange crash */ + if (oldima && GS(oldima->id.name) != ID_IM) { + ima = oldima; } } } diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index e3a9d06222b..597be0fd33b 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -438,7 +438,7 @@ static short apply_targetless_ik(Object *ob) /* rotation */ /* [#22409] is partially caused by this, as slight numeric error introduced during * the solving process leads to locked-axis values changing. However, we cannot modify - * the values here, or else there are huge discreptancies between IK-solver (interactive) + * the values here, or else there are huge discrepancies between IK-solver (interactive) * and applied poses. */ if (parchan->rotmode > 0) diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index fe2e218637a..7d4147fc94d 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -86,7 +86,7 @@ typedef struct IDProperty { #define IDP_STRING_SUB_UTF8 0 /* default */ #define IDP_STRING_SUB_BYTE 1 /* arbitrary byte array, _not_ null terminated */ /*->flag*/ -#define IDP_FLAG_GHOST (1<<7) /* this means the propery is set but RNA will return +#define IDP_FLAG_GHOST (1<<7) /* this means the property is set but RNA will return * false when checking 'RNA_property_is_set', * currently this is a runtime flag */ diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index aab3483e29b..4920b40c854 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -526,7 +526,7 @@ static int rna_Property_readonly_get(PointerRNA *ptr) { PropertyRNA *prop = (PropertyRNA *)ptr->data; - /* don't use this becaure it will call functions that check the internal + /* don't use this because it will call functions that check the internal * data for introspection we only need to know if it can be edited so the * flag is better for this */ /* return RNA_property_editable(ptr, prop); */ diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index b66f6820734..44278d116b8 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -145,7 +145,7 @@ EnumPropertyItem snap_node_element_items[] = { }; -/* workaround for duplice enums, +/* workaround for duplicate enums, * have each enum line as a defne then conditionally set it or not */ @@ -771,7 +771,7 @@ static EnumPropertyItem *rna_ImageFormatSettings_color_mode_itemf(bContext *C, P #ifdef WITH_FFMPEG /* a WAY more crappy case than B&W flag: depending on codec, file format MIGHT support * alpha channel. for example MPEG format with h264 codec can't do alpha channel, but - * the same MPEG format with QTRLE codec can easily handle alpga channel. + * the same MPEG format with QTRLE codec can easily handle alpha channel. * not sure how to deal with such cases in a nicer way (sergey) */ if (is_render) { Scene *scene = ptr->id.data; @@ -1105,7 +1105,7 @@ static void rna_RenderSettings_color_management_update(Main *bmain, Scene *UNUSE if (ntree && scene->use_nodes) { /* images are freed here, stop render and preview threads, until - * Image is threadsafe. when we are changing this propery from a + * Image is threadsafe. when we are changing this property from a * python script in the render thread, don't stop own thread */ if (BLI_thread_is_main()) WM_jobs_stop_all(bmain->wm.first); diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index ab293462228..8715d0c2b1d 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -128,7 +128,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, return derivedData; - /* 2.64 used this... */ + /* 2.63 used this... */ /* dm = bmd->object->derivedFinal; */ /* but we want to make sure we can get the object diff --git a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp index 35c791e427d..f408b2cd7c9 100644 --- a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp +++ b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp @@ -27,7 +27,7 @@ /** \file gameengine/Ketsji/KX_SCA_DynamicActuator.cpp * \ingroup ketsji - * Adjust dynamics settins for this object + * Adjust dynamics settings for this object */ /* Previously existed as: diff --git a/source/gameengine/Rasterizer/RAS_FramingManager.h b/source/gameengine/Rasterizer/RAS_FramingManager.h index 6312f83737e..dd640bc6839 100644 --- a/source/gameengine/Rasterizer/RAS_FramingManager.h +++ b/source/gameengine/Rasterizer/RAS_FramingManager.h @@ -289,7 +289,7 @@ private : /** * Private constructor - this class is not meant - * for instanciation. + * for instantiation. */ RAS_FramingManager(