diff options
39 files changed, 86 insertions, 83 deletions
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 6f3facb6d9d..a9b58ea1f99 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -453,7 +453,7 @@ void animviz_calc_motionpaths(Scene *scene, ListBase *targets) /* free curve path data * NOTE: frees the path itself! - * NOTE: this is increasingly innacurate with non-uniform BevPoint subdivisions [#24633] + * NOTE: this is increasingly inaccurate with non-uniform BevPoint subdivisions [#24633] */ void free_path(Path *path) { diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index ea353fc9073..4ac1f126c35 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -1589,14 +1589,14 @@ static NlaEvalChannel *nlaevalchan_verify (PointerRNA *ptr, ListBase *channels, /* get path, remapped as appropriate to work in its new environment */ /* free_path= */ /* UNUSED */ animsys_remap_path(strip->remap, fcu->rna_path, &path); - /* a valid property must be available, and it must be animateable */ + /* a valid property must be available, and it must be animatable */ if (RNA_path_resolve(ptr, path, &new_ptr, &prop) == 0) { if (G.f & G_DEBUG) printf("NLA Strip Eval: Cannot resolve path \n"); return NULL; } - /* only ok if animateable */ + /* only ok if animatable */ else if (RNA_property_animateable(&new_ptr, prop) == 0) { - if (G.f & G_DEBUG) printf("NLA Strip Eval: Property not animateable \n"); + if (G.f & G_DEBUG) printf("NLA Strip Eval: Property not animatable \n"); return NULL; } diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 3cc73d7f7f1..37a95382c25 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -1834,7 +1834,7 @@ void BKE_image_signal(Image *ima, ImageUser *iuser, int signal) break; } - /* dont use notifiers because they are not 100% sure to succseed + /* dont use notifiers because they are not 100% sure to succeeded * this also makes sure all scenes are accounted for. */ { Scene *scene; diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index 52e9dcaa578..ed7e84cf174 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -1753,7 +1753,7 @@ float init_meta(Scene *scene, Object *ob) /* return totsize */ } /* create "new" bb, only point 0 and 6, which are - * neccesary for octal tree filling */ + * necessary for octal tree filling */ mainb[a]->bb->vec[0][0] = min_x - ml->rad; mainb[a]->bb->vec[0][1] = min_y - ml->rad; mainb[a]->bb->vec[0][2] = min_z - ml->rad; diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 23cda362f74..1cab220836b 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -2192,7 +2192,7 @@ int mesh_recalcTessellation(CustomData *fdata, CustomData *ldata, CustomData *pdata, MVert *mvert, int totface, int UNUSED(totloop), int totpoly, - /* when teseelating to recalcilate normals after + /* when tessellating to recalcilate normals after * we can skip copying here */ const int do_face_nor_cpy) { diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 4f48fb0270f..8fef6baa34d 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -3289,7 +3289,7 @@ static void mesh_to_softbody(Scene *scene, Object *ob) get_scalar_from_vertexgroup(ob, a,(short) (sb->vertgroup-1), &bp->goal); /* do this always, regardless successfull read from vertex group */ - /* this is where '2.5 every thing is animateable' goes wrong in the first place jow_go_for2_5 */ + /* this is where '2.5 every thing is animatable' goes wrong in the first place jow_go_for2_5 */ /* 1st coding action to take : move this to frame level */ /* reads: leave the bp->goal as it was read from vertex group / or default .. we will need it at per frame call */ /* should be fixed for meshes */ @@ -3585,7 +3585,7 @@ static void curve_surf_to_softbody(Scene *scene, Object *ob) if (nu->bezt) { /* bezier case ; this is nicly said naive; who ever wrote this part, it was not me (JOW) :) */ /* a: never ever make tangent handles (sub) and or (ob)ject to collision */ - /* b: rather calculate them using some C2 (C2= continous in second derivate -> no jump in bending ) condition */ + /* b: rather calculate them using some C2 (C2= continuous in second derivate -> no jump in bending ) condition */ /* not too hard to do, but needs some more code to care for; some one may want look at it JOW 2010/06/12*/ for (bezt=nu->bezt, a=0; a<nu->pntsu; a++, bezt++, bp+=3, curindex+=3) { if (setgoal) { diff --git a/source/blender/bmesh/bmesh_operator_api.h b/source/blender/bmesh/bmesh_operator_api.h index 04cca767d9e..a0e2ba325b0 100644 --- a/source/blender/bmesh/bmesh_operator_api.h +++ b/source/blender/bmesh/bmesh_operator_api.h @@ -35,7 +35,7 @@ extern "C" { #include <stdarg.h> -/* +/** * operators represent logical, executable mesh modules. all topological * operations involving a bmesh has to go through them. * @@ -55,18 +55,22 @@ extern "C" { * bmesh_opdefines.c and the BMOpDefine struct for how to define new operators. * * in general, operators are fed arrays of elements, created using either - * BM_HeaderFlag_To_Slot or BM_Flag_To_Slot (or through one of the format - * specifyers in BMO_op_callf or BMO_op_initf). Note that multiple element - * types (e.g. faces and edges) can be fed to the same slot array. Operators - * act on this data, and possibly spit out data into output slots. + * #BMO_slot_buffer_from_hflag or #BMO_slot_buffer_from_flag + * (or through one of the format specifiers in #BMO_op_callf or #BMO_op_initf). + * + * \note multiple element types (e.g. faces and edges) + * can be fed to the same slot array. Operators act on this data, + * and possibly spit out data into output slots. + * + * \note operators should never read from header flags (e.g. element->head.flag). + * For example, if you want an operator to only operate on selected faces, you + * should use #BMO_slot_buffer_from_hflag to put the selected elements into a slot. + * + * \note when you read from an element slot array or mapping, you can either tool-flag + * all the elements in it, or read them using an iterator API (which is semantically + * similar to the iterator api in bmesh_iterators.h). * - * some notes: - * - operators should never read from header flags (e.g. element->head.flag). for - * example, if you want an operator to only operate on selected faces, you - * should use BM_HeaderFlag_To_Slot to put the selected elements into a slot. - * - when you read from an element slot array or mapping, you can either tool-flag - * all the elements in it, or read them using an iterator APi (which is - * semantically similar to the iterator api in bmesh_iterators.h). + * \note only #BMLoop items can't be put into slots as with verts, edges & faces. */ struct GHashIterator; diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index a04e5eda5a2..6a38b9a136c 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -649,7 +649,7 @@ static int bm_loop_length(BMLoop *l) * \brief Loop Reverse * * Changes the winding order of a face from CW to CCW or vice versa. - * This euler is a bit peculiar in compairson to others as it is its + * This euler is a bit peculiar in comparison to others as it is its * own inverse. * * BMESH_TODO: reinsert validation code. @@ -1096,7 +1096,7 @@ static BMFace *bm_face_create__sfme(BMesh *bm, BMFace *UNUSED(example)) * level wrapping functions (when holes are fully implemented, anyway). * * \note that holes represents which holes goes to the new face, and of - * course this requires removing them from the exitsing face first, since + * course this requires removing them from the existing face first, since * you cannot have linked list links inside multiple lists. * * \return A BMFace pointer diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c index 911c3872161..a696808c133 100644 --- a/source/blender/bmesh/intern/bmesh_operators.c +++ b/source/blender/bmesh/intern/bmesh_operators.c @@ -679,7 +679,7 @@ static void BMO_slot_buffer_from_all(BMesh *bm, BMOperator *op, const char *slot * into a slot for an operator. */ void BMO_slot_buffer_from_hflag(BMesh *bm, BMOperator *op, const char *slotname, - const char hflag, const char htype) + const char hflag, const char htype) { BMIter elements; BMElem *ele; diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index f6111e75e80..15a5a7d71b0 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -707,7 +707,7 @@ static int goodline(float (*projectverts)[3], BMFace *f, int v1i, * * Used by tesselator to find * the next triangle to 'clip off' - * of a polygon while tesselating. + * of a polygon while tessellating. */ static BMLoop *find_ear(BMesh *UNUSED(bm), BMFace *f, float (*verts)[3], const int nvert) { diff --git a/source/blender/bmesh/intern/bmesh_walkers.h b/source/blender/bmesh/intern/bmesh_walkers.h index 765576c9ab7..4c8830e61e3 100644 --- a/source/blender/bmesh/intern/bmesh_walkers.h +++ b/source/blender/bmesh/intern/bmesh_walkers.h @@ -103,7 +103,7 @@ enum { /* walk over connected geometry. can restrict to a search flag, * or not, it's optional. * - * takes a vert as an arugment, and spits out edges, restrict flag acts + * takes a vert as an argument, and spits out edges, restrict flag acts * on the edges as well. */ BMW_SHELL, /*walk over an edge loop. search flag doesn't do anything.*/ diff --git a/source/blender/bmesh/operators/bmo_edgesplit.c b/source/blender/bmesh/operators/bmo_edgesplit.c index 059ee882fb8..5b5eb6b4cca 100644 --- a/source/blender/bmesh/operators/bmo_edgesplit.c +++ b/source/blender/bmesh/operators/bmo_edgesplit.c @@ -386,7 +386,7 @@ void bmo_edgesplit_exec(BMesh *bm, BMOperator *op) BMO_elem_flag_enable(bm, f2, FACE_NEW); } - /* remake_face() sets invalid indecies, + /* remake_face() sets invalid indices, * likely these will be corrected on operator exit anyway */ bm->elem_index_dirty &= ~BM_EDGE; diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 62d4ea25c3d..4858fbf4f85 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1229,7 +1229,7 @@ static size_t animdata_filter_shapekey (bAnimContext *ac, ListBase *anim_data, K /* loop through the channels adding ShapeKeys as appropriate */ for (kb= key->block.first; kb; kb= kb->next) { - /* skip the first one, since that's the non-animateable basis */ + /* skip the first one, since that's the non-animatable basis */ // XXX maybe in future this may become handy? if (kb == key->block.first) continue; diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c index e8f3fc28d74..6af95b35ba8 100644 --- a/source/blender/editors/animation/drivers.c +++ b/source/blender/editors/animation/drivers.c @@ -521,7 +521,7 @@ void ANIM_OT_driver_button_add (wmOperatorType *ot) /* callbacks */ ot->exec= add_driver_button_exec; - //op->poll= ??? // TODO: need to have some animateable property to do this + //op->poll= ??? // TODO: need to have some animatable property to do this /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 5e617979716..8bb29c3c41c 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -1449,9 +1449,9 @@ static int insert_key_button_exec (bContext *C, wmOperator *op) else if (G.f & G_DEBUG) { printf("ptr.data = %p, prop = %p,", (void *)ptr.data, (void *)prop); if (prop) - printf("animateable = %d \n", RNA_property_animateable(&ptr, prop)); + printf("animatable = %d \n", RNA_property_animateable(&ptr, prop)); else - printf("animateable = NULL \n"); + printf("animatable = NULL \n"); } if (success) { diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 27a18980b34..ba542d5d801 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -3605,7 +3605,7 @@ void ARMATURE_OT_subdivide(wmOperatorType *ot) /* Switch Direction operator: * Currently, this does not use context loops, as context loops do not make it - * easy to retrieve any hierarchial/chain relationships which are necessary for + * easy to retrieve any hierarchical/chain relationships which are necessary for * this to be done easily. */ diff --git a/source/blender/editors/include/BIF_gl.h b/source/blender/editors/include/BIF_gl.h index d34e6f74b4c..e29e0af59b1 100644 --- a/source/blender/editors/include/BIF_gl.h +++ b/source/blender/editors/include/BIF_gl.h @@ -43,7 +43,7 @@ * * This define converts a numerical value to the equivalent 24-bit * color, while not being endian-sensitive. On little-endians, this - * is the same as doing a 'naive'indexing, on big-endian, it is not! + * is the same as doing a 'naive' indexing, on big-endian, it is not! * */ #define cpack(x) glColor3ub( ((x)&0xFF), (((x)>>8)&0xFF), (((x)>>16)&0xFF) ) diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 51526c7c902..1fc9b18a0f6 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -802,7 +802,7 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, TIP_("This modifier could be applied on splines' points only")); uiButSetFlag(but, UI_BUT_DISABLED); } else if (mti->type != eModifierTypeType_Constructive) { - /* constructive modifiers tesselates curve before applying */ + /* constructive modifiers tessellates curve before applying */ uiItemR(row, &ptr, "use_apply_on_spline", 0, "", ICON_NONE); } } diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 6632cfc62ac..d8f187d181a 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -801,7 +801,7 @@ static void view_zoomdrag_apply(bContext *C, wmOperator *op) dx= RNA_float_get(op->ptr, "deltax"); dy= RNA_float_get(op->ptr, "deltay"); - /* continous zoom shouldn't move that fast... */ + /* continuous zoom shouldn't move that fast... */ if (U.viewzoom == USER_ZOOM_CONT) { // XXX store this setting as RNA prop? double time= PIL_check_seconds_timer(); float time_step= (float)(time - vzd->timer_lastdraw); @@ -1004,7 +1004,7 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, wmEvent *event) fac= 0.01f * (event->y - vzd->lasty); dy= fac * (v2d->cur.ymax - v2d->cur.ymin); #if 0 - /* continous zoom shouldn't move that fast... */ + /* continuous zoom shouldn't move that fast... */ if (U.viewzoom == USER_ZOOM_CONT) { // XXX store this setting as RNA prop? double time= PIL_check_seconds_timer(); float time_step= (float)(time - vzd->timer_lastdraw); diff --git a/source/blender/editors/mesh/bmesh_utils.c b/source/blender/editors/mesh/bmesh_utils.c index 0f9bc29a16d..5fb0966b107 100644 --- a/source/blender/editors/mesh/bmesh_utils.c +++ b/source/blender/editors/mesh/bmesh_utils.c @@ -277,7 +277,7 @@ void EDBM_MakeEditBMesh(ToolSettings *ts, Scene *UNUSED(scene), Object *ob) MEM_freeN(me->edit_btmesh); } - /* currently executing operators re-tesselates, so we can avoid doing here + /* currently executing operators re-tessellates, so we can avoid doing here * but at some point it may need to be added back. */ #if 0 me->edit_btmesh = BMEdit_Create(bm, TRUE); diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 4b4d7354898..94591cabcd6 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -333,7 +333,7 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op) oglrender->scene->customdata_mask_modal = (ED_view3d_datamask(oglrender->scene, oglrender->v3d) | ED_view3d_object_datamask(oglrender->scene) ); - /* apply immediately incase we're rendeing from a script, + /* apply immediately incase we're rendering from a script, * running notifiers again will overwrite */ oglrender->scene->customdata_mask |= oglrender->scene->customdata_mask_modal; diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 25b8b8415d9..f3a6904f8d0 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -704,7 +704,7 @@ static void screen_test_scale(bScreen *sc, int winsizex, int winsizey) #define SCR_BACK 0.55 #define SCR_ROUND 12 -/* draw vertical shape visualising future joining (left as well +/* draw vertical shape visualizing future joining (left as well * right direction of future joining) */ static void draw_horizontal_join_shape(ScrArea *sa, char dir) { @@ -777,7 +777,7 @@ static void draw_horizontal_join_shape(ScrArea *sa, char dir) glRectf(points[6].x, points[6].y, points[9].x, points[9].y); } -/* draw vertical shape visualising future joining (up/down direction) */ +/* draw vertical shape visualizing future joining (up/down direction) */ static void draw_vertical_join_shape(ScrArea *sa, char dir) { vec2f points[10]; diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 1937cb7b05c..e84a7c623b4 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -1845,7 +1845,7 @@ static void do_weight_paint_vertex(/* vars which remain the same for every vert if (wpi->do_auto_normalize) { /* note on normalize - this used to be applied after painting and normalize all weights, * in some ways this is good because there is feedback where the more weights involved would - * 'risist' so you couldn't instantly zero out other weights by painting 1.0 on the active. + * 'resist' so you couldn't instantly zero out other weights by painting 1.0 on the active. * * However this gave a problem since applying mirror, then normalize both verts * the resulting weight wont match on both sides. @@ -1869,7 +1869,7 @@ static void do_weight_paint_vertex(/* vars which remain the same for every vert * - auto normalize is enabled * - the group you are painting onto has a L / R version * - * We wan't L/R vgroups to have the same weight but this cant be if both are over 0.5, + * We want L/R vgroups to have the same weight but this cant be if both are over 0.5, * We _could_ have special check for that, but this would need its own normalize function which * holds 2 groups from changing at once. * diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index ca0a9c15c8c..9643958b741 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -1128,7 +1128,7 @@ static void do_outliner_drivers_editop(SpaceOops *soops, ListBase *tree, ReportL short flag= 0; short groupmode= KSP_GROUP_KSNAME; - /* check if RNA-property described by this selected element is an animateable prop */ + /* check if RNA-property described by this selected element is an animatable prop */ if (ELEM(tselem->type, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM) && RNA_property_animateable(&te->rnaptr, te->directdata)) { /* get id + path + index info from the selected element */ tree_element_to_path(soops, te, tselem, @@ -1307,7 +1307,7 @@ static void do_outliner_keyingset_editop(SpaceOops *soops, KeyingSet *ks, ListBa short flag= 0; short groupmode= KSP_GROUP_KSNAME; - /* check if RNA-property described by this selected element is an animateable prop */ + /* check if RNA-property described by this selected element is an animatable prop */ if (ELEM(tselem->type, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM) && RNA_property_animateable(&te->rnaptr, te->directdata)) { /* get id + path + index info from the selected element */ tree_element_to_path(soops, te, tselem, diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index df38f87b798..84ae948f275 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -592,7 +592,7 @@ static int sequencer_add_effect_strip_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - /* If seq1 is NULL and no error was rasied it means the seq is standalone + /* If seq1 is NULL and no error was raised it means the seq is standalone * (like color strips) and we need to check its start and end frames are valid */ if (seq1==NULL && end_frame <= start_frame) { BKE_report(op->reports, RPT_ERROR, "Start and end frame are not set"); diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index ad3c223432a..ecccb673c57 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -778,7 +778,7 @@ static void drawcentercircle(View3D *v3d, RegionView3D *rv3d, const float co[3], UI_ThemeColorShadeAlpha(TH_WIRE, 0, -30); glDrawArrays(GL_LINE_LOOP, 0, CIRCLE_RESOL); - /* finishe up */ + /* finish up */ glDisableClientState(GL_VERTEX_ARRAY); glDisable(GL_BLEND); diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index dd121265522..fc5ef42b462 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2225,7 +2225,7 @@ static void gpu_update_lamps_shadows(Scene *scene, View3D *v3d) } /* render shadows after updating all lamps, nested object_duplilist - * don't work correct since it's replacing object matrices */ + * don't work correct since it's replacing object matrices */ for (shadow=shadows.first; shadow; shadow=shadow->next) { /* this needs to be done better .. */ float viewmat[4][4], winmat[4][4]; diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index c78d63c174b..c8d577a315e 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -302,12 +302,12 @@ void view3d_boxview_copy(ScrArea *sa, ARegion *ar) /* 'clip' is used to know if our clip setting has changed */ void ED_view3d_quadview_update(ScrArea *sa, ARegion *ar, short do_clip) { - ARegion *arsync= NULL; + ARegion *ar_sync= NULL; RegionView3D *rv3d= ar->regiondata; short viewlock; /* this function copies flags from the first of the 3 other quadview - regions to the 2 other, so it assumes this is the region whose - properties are always being edited, weak */ + * regions to the 2 other, so it assumes this is the region whose + * properties are always being edited, weak */ viewlock= rv3d->viewlock; if ((viewlock & RV3D_LOCKED)==0) @@ -326,15 +326,15 @@ void ED_view3d_quadview_update(ScrArea *sa, ARegion *ar, short do_clip) rv3d->rflag &= ~RV3D_BOXCLIP; } - /* use arsync so we sync with one of the aligned views below + /* use ar_sync so we sync with one of the aligned views below * else the view jumps on changing view settings like 'clip' * since it copies from the perspective view */ - arsync= ar; + ar_sync= ar; } } if (rv3d->viewlock & RV3D_BOXVIEW) { - view3d_boxview_copy(sa, arsync ? arsync : sa->regionbase.last); + view3d_boxview_copy(sa, ar_sync ? ar_sync : sa->regionbase.last); } ED_area_tag_redraw(sa); @@ -445,8 +445,8 @@ static void viewops_data_create(bContext *C, wmOperator *op, wmEvent *event) negate_v3_v3(my_origin, rv3d->ofs); /* ofs is flipped */ - /* Set the dist value to be the distance from this 3d point */ - /* this means youll always be able to zoom into it and panning wont go bad when dist was zero */ + /* Set the dist value to be the distance from this 3d point + * this means youll always be able to zoom into it and panning wont go bad when dist was zero */ /* remove dist value */ upvec[0] = upvec[1] = 0; @@ -646,10 +646,10 @@ static void viewrotate_apply(ViewOpsData *vod, int x, int y) si -= 2.0f; /* This relation is used instead of - * phi = asin(si) so that the angle - * of rotation is linearly proportional - * to the distance that the mouse is - * dragged. */ + * - phi = asin(si) so that the angle + * - of rotation is linearly proportional + * - to the distance that the mouse is + * - dragged. */ phi = si * (float)(M_PI / 2.0); q1[0]= cos(phi); @@ -676,8 +676,8 @@ static void viewrotate_apply(ViewOpsData *vod, int x, int y) float m_inv[3][3]; float xvec[3] = {1.0f, 0.0f, 0.0f}; /* Sensitivity will control how fast the viewport rotates. 0.0035 was - obtained experimentally by looking at viewport rotation sensitivities - on other modeling programs. */ + * obtained experimentally by looking at viewport rotation sensitivities + * on other modeling programs. */ /* Perhaps this should be a configurable user parameter. */ const float sensitivity = 0.0035f; @@ -3538,11 +3538,12 @@ int ED_view3d_autodist_depth_seg(struct ARegion *ar, const int mval_sta[2], cons return (*depth==FLT_MAX) ? 0:1; } -/* Gets the view trasnformation from a camera -* currently dosnt take camzoom into account -* -* The dist is not modified for this function, if NULL its assimed zero -* */ +/** + * Gets the view trasnformation from a camera + * currently dosnt take camzoom into account + * + * The dist is not modified for this function, if NULL its assimed zero + */ void ED_view3d_from_m4(float mat[][4], float ofs[3], float quat[4], float *dist) { /* Offset */ diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index 0f62348f418..f930de8db06 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -528,7 +528,7 @@ typedef struct AnimMapPair { /* Retargetting Information for Actions * - * This should only be used if it is strictly necessary (i.e. user will need to explictly + * This should only be used if it is strictly necessary (i.e. user will need to explicitly * add this when they find that some channels do not match, or motion is not going to right * places). When executing an action, this will be checked to see if it provides any useful * remaps for the given paths. @@ -661,7 +661,7 @@ typedef enum eNlaStrip_Type { /* NLA Track (nlt) * - * A track groups a bunch of 'strips', which should form a continous set of + * A track groups a bunch of 'strips', which should form a continuous set of * motion, on top of which other such groups can be layered. This should allow * for animators to work in a non-destructive manner, layering tweaks, etc. over * 'rough' blocks of their work. diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 454008c73a7..9fb24199571 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -131,7 +131,7 @@ typedef struct Brush { #define BRUSH_FRONTFACE (1<<27) #define BRUSH_CUSTOM_ICON (1<<28) -/* temporary flag which sets up autmatically for correct +/* temporary flag which sets up automatically for correct * brush drawing when inverted modal operator is running */ #define BRUSH_INVERTED (1<<29) diff --git a/source/blender/makesdna/DNA_fileglobal_types.h b/source/blender/makesdna/DNA_fileglobal_types.h index 0ae5c2465da..7e81041fe4a 100644 --- a/source/blender/makesdna/DNA_fileglobal_types.h +++ b/source/blender/makesdna/DNA_fileglobal_types.h @@ -36,7 +36,7 @@ struct bScreen; struct Scene; /** - * FileGlobal stores a part of the current user-unterface settings at + * FileGlobal stores a part of the current user-interface settings at * the moment of saving, and the file-specific settings. */ typedef struct FileGlobal { diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index ee9c6b26e2f..af45c6d1696 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -152,9 +152,9 @@ typedef enum PropertyFlag { * for editing. */ PROP_LIB_EXCEPTION = 1<<16, - /* animateable means the property can be driven by some + /* animatable means the property can be driven by some * other input, be it animation curves, expressions, .. - * properties are animateable by default except for pointers + * properties are animatable by default except for pointers * and collections */ PROP_ANIMATABLE = 1<<1, diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index 414ebe47e97..ac832611ded 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -59,13 +59,13 @@ extern BPy_StructRNA *bpy_context_module; static EnumPropertyItem property_flag_items[] = { {PROP_HIDDEN, "HIDDEN", 0, "Hidden", ""}, {PROP_SKIP_SAVE, "SKIP_SAVE", 0, "Skip Save", ""}, - {PROP_ANIMATABLE, "ANIMATABLE", 0, "Animateable", ""}, + {PROP_ANIMATABLE, "ANIMATABLE", 0, "Animatable", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem property_flag_enum_items[] = { {PROP_HIDDEN, "HIDDEN", 0, "Hidden", ""}, {PROP_SKIP_SAVE, "SKIP_SAVE", 0, "Skip Save", ""}, - {PROP_ANIMATABLE, "ANIMATABLE", 0, "Animateable", ""}, + {PROP_ANIMATABLE, "ANIMATABLE", 0, "Animatable", ""}, {PROP_ENUM_FLAG, "ENUM_FLAG", 0, "Enum Flag", ""}, {0, NULL, 0, NULL, NULL}}; diff --git a/source/creator/creator.c b/source/creator/creator.c index 0b67dfabf16..c047111f604 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -1236,10 +1236,8 @@ int main(int argc, const char **argv) /** * NOTE: the U.pythondir string is NULL until WM_init() is executed, * so we provide the BPY_ function below to append the user defined - * pythondir to Python's sys.path at this point. Simply putting - * WM_init() before BPY_python_start() crashes Blender at startup. - * Update: now this function also inits the bpymenus, which also depend - * on U.pythondir. + * python-dir to Python's sys.path at this point. Simply putting + * WM_init() before #BPY_python_start() crashes Blender at startup. */ // TODO - U.pythondir diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h index 263d08ead0c..18afb0a6e78 100644 --- a/source/gameengine/Expressions/PyObjectPlus.h +++ b/source/gameengine/Expressions/PyObjectPlus.h @@ -186,7 +186,7 @@ public: \ #define PY_SET_ATTR_SUCCESS 0 /** - * These macros are helpfull when embedding Python routines. The second + * These macros are helpful when embedding Python routines. The second * macro is one that also requires a documentation string */ #define KX_PYMETHOD(class_name, method_name) \ diff --git a/source/gameengine/Ketsji/KX_CameraActuator.cpp b/source/gameengine/Ketsji/KX_CameraActuator.cpp index 361fe3326f5..1db8641376e 100644 --- a/source/gameengine/Ketsji/KX_CameraActuator.cpp +++ b/source/gameengine/Ketsji/KX_CameraActuator.cpp @@ -210,7 +210,7 @@ static void Kx_VecUpMat3(float vec[3], float mat[][3], short axis) bool KX_CameraActuator::Update(double curtime, bool frame) { - /* wondering... is it really neccesary/desirable to suppress negative */ + /* wondering... is it really necessary/desirable to suppress negative */ /* events here? */ bool bNegativeEvent = IsNegativeEvent(); RemoveAllEvents(); diff --git a/source/gameengine/Ketsji/KX_CameraActuator.h b/source/gameengine/Ketsji/KX_CameraActuator.h index eb0a4574a8f..c67174d2830 100644 --- a/source/gameengine/Ketsji/KX_CameraActuator.h +++ b/source/gameengine/Ketsji/KX_CameraActuator.h @@ -40,7 +40,7 @@ #include "SCA_LogicManager.h" /** - * The camera actuator does a Robbie Muller prespective for you. This is a + * The camera actuator does a Robbie Muller perspective for you. This is a * weird set of rules that positions the camera sort of behind the object, * tracking, while avoiding any objects between the 'ideal' position and the * actor being tracked. diff --git a/source/gameengine/Ketsji/KX_PythonSeq.cpp b/source/gameengine/Ketsji/KX_PythonSeq.cpp index 430dcdbd153..959127def5c 100644 --- a/source/gameengine/Ketsji/KX_PythonSeq.cpp +++ b/source/gameengine/Ketsji/KX_PythonSeq.cpp @@ -356,7 +356,7 @@ PyMethodDef KX_PythonSeq_methods[] = { }; /* - * Initialize the interator index + * Initialize the iterator index */ static PyObject *KX_PythonSeq_getIter(KX_PythonSeq *self) diff --git a/source/gameengine/VideoTexture/ImageBuff.cpp b/source/gameengine/VideoTexture/ImageBuff.cpp index 899a9f9782e..d28babfcc90 100644 --- a/source/gameengine/VideoTexture/ImageBuff.cpp +++ b/source/gameengine/VideoTexture/ImageBuff.cpp @@ -324,7 +324,7 @@ static PyObject * plot (PyImage * self, PyObject * args) if (PyArg_ParseTuple(args, "s*hhhh|h:plot", &buffer, &width, &height, &x, &y, &mode)) { // correct decoding, verify that buffer size is correct - // we need a continous memory buffer + // we need a continuous memory buffer if (testPyBuffer(&buffer, width, height, 4)) { getImageBuff(self)->plot((unsigned char*)buffer.buf, width, height, x, y, mode); |