diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-03 15:45:08 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-03 15:45:08 +0400 |
commit | 9d49fa0e6373d78c794e8472ed3f527392dfabcd (patch) | |
tree | fdbbdad43aa2c0ed8983721351b26f94e06e7c78 /source/blender/editors | |
parent | 1f928833f3677fa47a10099205c9f7ffa9adfadb (diff) |
style cleanup - spelling corrections & update some incorrect comments.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/animation/anim_filter.c | 2 | ||||
-rw-r--r-- | source/blender/editors/animation/drivers.c | 2 | ||||
-rw-r--r-- | source/blender/editors/animation/keyframing.c | 4 | ||||
-rw-r--r-- | source/blender/editors/armature/editarmature.c | 2 | ||||
-rw-r--r-- | source/blender/editors/include/BIF_gl.h | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/bmesh_utils.c | 2 | ||||
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_edit.c | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_edit.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 39 |
16 files changed, 40 insertions, 39 deletions
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 */ |