diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-03-14 05:21:13 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-03-14 05:21:13 +0300 |
commit | 0024768f8838cbbdd00fcbe181b771a5523a521f (patch) | |
tree | 5b1afb01d08eb02524461e92f487dfcddcb7669e /source | |
parent | 34fe03c7f25cd06876a79af418ced9f4cfa91226 (diff) |
Cleanup: style/spelling
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/mesh_evaluate.c | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/BLI_ghash.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_inset.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_lamp.c | 6 | ||||
-rw-r--r-- | source/blender/render/intern/source/render_texture.c | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c index 9fdd541813a..fd75a54c1f7 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.c +++ b/source/blender/blenkernel/intern/mesh_evaluate.c @@ -3216,8 +3216,8 @@ void BKE_mesh_polygon_flip(MPoly *mpoly, MLoop *mloop, CustomData *ldata) /* Note that we keep same start vertex for flipped face. */ - /* We also have to update loops' edge - * (they ell get ther original 'other edge', that is, the original edge of their original previous loop)... */ + /* We also have to update loops edge + * (they will get their original 'other edge', that is, the original edge of their original previous loop)... */ unsigned int prev_edge_index = mloop[loopstart].e; mloop[loopstart].e = mloop[loopend].e; diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index 381535882b7..3233a5840e0 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -1441,7 +1441,7 @@ bool BLI_gset_haskey(GSet *gs, const void *key) * * \param r_key: The removed key. * \param state: Used for efficient removal. - * \return true if there was somethjing to pop, false if gset was already empty. + * \return true if there was something to pop, false if gset was already empty. */ bool BLI_gset_pop( GSet *gs, GSetIterState *state, diff --git a/source/blender/bmesh/operators/bmo_inset.c b/source/blender/bmesh/operators/bmo_inset.c index e0569489762..ef5d90e6acb 100644 --- a/source/blender/bmesh/operators/bmo_inset.c +++ b/source/blender/bmesh/operators/bmo_inset.c @@ -173,7 +173,7 @@ static void bm_loop_customdata_merge( l_b_inner_inset = BM_edge_other_loop(e_b, l_b_inner); BLI_assert(l_a_inner_inset->v == l_b_inner_inset->v); - /* check if ther is no chance of diversion */ + /* check if there is no chance of diversion */ if (l_a_inner_inset->f == l_b_inner_inset->f) { return; } diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c index b6b97d37c0f..e4e3699f301 100644 --- a/source/blender/makesrna/intern/rna_lamp.c +++ b/source/blender/makesrna/intern/rna_lamp.c @@ -457,21 +457,21 @@ static void rna_def_lamp_falloff(StructRNA *srna) RNA_def_property_float_sdna(prop, NULL, "coeff_const"); RNA_def_property_range(prop, 0.0f, FLT_MAX); RNA_def_property_ui_text(prop, "Constant Coefficient", - "Constant distance attenuation coefficient"); + "Constant distance attenuation coefficient"); RNA_def_property_update(prop, 0, "rna_Lamp_draw_update"); prop = RNA_def_property(srna, "linear_coefficient", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "coeff_lin"); RNA_def_property_range(prop, 0.0f, FLT_MAX); RNA_def_property_ui_text(prop, "Linear Coefficient", - "Linear distance attenuation coefficient"); + "Linear distance attenuation coefficient"); RNA_def_property_update(prop, 0, "rna_Lamp_draw_update"); prop = RNA_def_property(srna, "quadratic_coefficient", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "coeff_quad"); RNA_def_property_range(prop, 0.0f, FLT_MAX); RNA_def_property_ui_text(prop, "Quadratic Coefficient", - "Quadratic distance attenuation coefficient"); + "Quadratic distance attenuation coefficient"); RNA_def_property_update(prop, 0, "rna_Lamp_draw_update"); } diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index 5cb5c340d98..3399f8a21b1 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -3191,8 +3191,8 @@ void do_sky_tex( } break; case TEXCO_EQUIRECTMAP: - tempvec[0]= -atan2f(lo[2], lo[0]) / M_PI; - tempvec[1]= atan2f(lo[1], hypot(lo[0], lo[2])) / M_PI_2; + tempvec[0]= -atan2f(lo[2], lo[0]) / (float)M_PI; + tempvec[1]= atan2f(lo[1], hypot(lo[0], lo[2])) / (float)M_PI_2; tempvec[2]= 0.0f; co= tempvec; break; |