Commit: 133f79e4492eca400d0e043733d43ca522cdb2b9
Author: Campbell Barton
Date: Wed Oct 29 14:11:19 2014 +0100
Branches: master
https://developer.blender.org/rB133f79e4492eca400d0e043733d43ca522cdb2b9
Cleanup: warnings, typos
===================================================================
M intern/cycles/render/graph.cpp
M intern/ghost/intern/GHOST_Window.h
M intern/memutil/MEM_RefCounted.h
M intern/memutil/MEM_RefCountedC-Api.h
M source/blender/avi/intern/avi.c
M source/blender/blenkernel/BKE_animsys.h
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/rigidbody.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenlib/intern/path_util.c
M source/blender/bmesh/intern/bmesh_mods.c
M source/blender/bmesh/intern/bmesh_queries.c
M source/blender/bmesh/intern/bmesh_queries_inline.h
M source/blender/bmesh/intern/bmesh_walkers.c
M source/blender/bmesh/intern/bmesh_walkers_impl.c
M source/blender/bmesh/operators/bmo_create.c
M source/blender/bmesh/operators/bmo_similar.c
M source/blender/bmesh/tools/bmesh_bevel.c
M
source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/animation/keyframes_general.c
M source/blender/editors/armature/editarmature_sketch.c
M source/blender/editors/armature/pose_edit.c
M source/blender/editors/include/ED_keyframes_edit.h
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
M source/blender/freestyle/intern/stroke/ChainingIterators.h
M source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
M source/blender/makesdna/DNA_actuator_types.h
M source/blender/makesdna/intern/dna_genfile.c
M source/blender/makesrna/intern/makesrna.c
M source/blender/python/bmesh/bmesh_py_geometry.c
M source/blender/windowmanager/intern/wm_playanim.c
===================================================================
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp
index 45b0883..8fd8663 100644
--- a/intern/cycles/render/graph.cpp
+++ b/intern/cycles/render/graph.cpp
@@ -684,7 +684,7 @@ void ShaderGraph::bump_from_displacement()
* different shifted coordinates.
*
* these 3 displacement values are then fed into the bump node, which
will
- * output the the perturbed normal. */
+ * output the perturbed normal. */
ShaderInput *displacement_in = output()->input("Displacement");
diff --git a/intern/ghost/intern/GHOST_Window.h
b/intern/ghost/intern/GHOST_Window.h
index e470e40..15b8199 100644
--- a/intern/ghost/intern/GHOST_Window.h
+++ b/intern/ghost/intern/GHOST_Window.h
@@ -336,7 +336,7 @@ protected:
GHOST_TSuccess releaseNativeHandles();
- /** The the of drawing context installed in this window. */
+ /** The drawing context installed in this window. */
GHOST_TDrawingContextType m_drawingContextType;
/** The window user data */
diff --git a/intern/memutil/MEM_RefCounted.h b/intern/memutil/MEM_RefCounted.h
index 9da0103..88eaccf 100644
--- a/intern/memutil/MEM_RefCounted.h
+++ b/intern/memutil/MEM_RefCounted.h
@@ -41,7 +41,7 @@
* An object with reference counting.
* Base class for objects with reference counting.
* When a shared object is ceated, it has reference count == 1.
- * If the the reference count of a shared object reaches zero, the object
self-destructs.
+ * If the reference count of a shared object reaches zero, the object
self-destructs.
* The default destructor of this object has been made protected on purpose.
* This disables the creation of shared objects on the stack.
*
@@ -72,7 +72,7 @@ public:
/**
* Decreases the reference count of this object.
- * If the the reference count reaches zero, the object self-destructs.
+ * If the reference count reaches zero, the object self-destructs.
* @return the new reference count.
*/
inline virtual int decRef();
diff --git a/intern/memutil/MEM_RefCountedC-Api.h
b/intern/memutil/MEM_RefCountedC-Api.h
index a611482..79b0b6e 100644
--- a/intern/memutil/MEM_RefCountedC-Api.h
+++ b/intern/memutil/MEM_RefCountedC-Api.h
@@ -64,7 +64,7 @@ extern int MEM_RefCountedIncRef(MEM_TRefCountedObjectPtr
shared);
/**
* Decreases the reference count of this object.
- * If the the reference count reaches zero, the object self-destructs.
+ * If the reference count reaches zero, the object self-destructs.
* @param shared The object to query.
* @return The new reference count.
*/
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c
index a423c87..6ea94d3 100644
--- a/source/blender/avi/intern/avi.c
+++ b/source/blender/avi/intern/avi.c
@@ -676,7 +676,7 @@ AviError AVI_open_movie(const char *name, AviMovie *movie)
* instead of an offset from the movie beginning... this is...
* wacky, but we need to handle it. The wacky offset always
* starts at movi_offset it seems... so we'll check that.
- * Note the the offset needs an extra 4 bytes for some
+ * Note the offset needs an extra 4 bytes for some
* undetermined reason */
if (movie->entries[0].Offset == movie->movi_offset)
diff --git a/source/blender/blenkernel/BKE_animsys.h
b/source/blender/blenkernel/BKE_animsys.h
index e79822d..a5109ac 100644
--- a/source/blender/blenkernel/BKE_animsys.h
+++ b/source/blender/blenkernel/BKE_animsys.h
@@ -106,7 +106,7 @@ void BKE_keyingsets_free(struct ListBase *list);
/* ************************************* */
/* Path Fixing API */
-/* Fix all the paths for the the given ID + Action */
+/* Fix all the paths for the given ID + Action */
void BKE_action_fix_paths_rename(struct ID *owner_id, struct bAction *act,
const char *prefix, const char *oldName,
const char *newName, int oldSubscript, int
newSubscript, bool verify_paths);
diff --git a/source/blender/blenkernel/intern/armature.c
b/source/blender/blenkernel/intern/armature.c
index 875815d..00cfa05 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1662,7 +1662,7 @@ static void pose_proxy_synchronize(Object *ob, Object
*from, int layer_protected
if (pchanw.prop) {
pchanw.prop = IDP_CopyProperty(pchanw.prop);
- /* use the values from the the existing props */
+ /* use the values from the existing props */
if (pchan->prop) {
IDP_SyncGroupValues(pchanw.prop,
pchan->prop);
}
diff --git a/source/blender/blenkernel/intern/rigidbody.c
b/source/blender/blenkernel/intern/rigidbody.c
index 3d61b0b..2f6ac6c 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -401,7 +401,7 @@ static void rigidbody_validate_sim_shape(Object *ob, bool
rebuild)
height = size[2];
}
else if (rbo->shape == RB_SHAPE_SPHERE) {
- /* take radius to the the largest dimension to try and
encompass everything */
+ /* take radius to the largest dimension to try and encompass
everything */
radius = MAX3(size[0], size[1], size[2]);
}
@@ -483,7 +483,7 @@ void BKE_rigidbody_calc_volume(Object *ob, float *r_vol)
height = size[2];
}
else if (rbo->shape == RB_SHAPE_SPHERE) {
- /* take radius to the the largest dimension to try and
encompass everything */
+ /* take radius to the largest dimension to try and encompass
everything */
radius = max_fff(size[0], size[1], size[2]) * 0.5f;
}
diff --git a/source/blender/blenkernel/intern/softbody.c
b/source/blender/blenkernel/intern/softbody.c
index 1357556..a680d8d 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -3349,7 +3349,7 @@ static void mesh_to_softbody(Scene *scene, Object *ob)
build_bps_springlist(ob); /* scan for springs attached
to bodypoints ONCE */
/* insert *other second order* springs if desired */
if (sb->secondspring > 0.0000001f) {
- add_2nd_order_springs(ob, sb->secondspring); /*
exploits the the first run of build_bps_springlist(ob);*/
+ add_2nd_order_springs(ob, sb->secondspring); /*
exploits the first run of build_bps_springlist(ob);*/
build_bps_springlist(ob); /* yes we need to do
it again*/
}
springs_from_mesh(ob); /* write the 'rest'-length of
the springs */
diff --git a/source/blender/blenlib/intern/path_util.c
b/source/blender/blenlib/intern/path_util.c
index d5af980..e3e13b0 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -1580,7 +1580,7 @@ void BLI_make_existing_file(const char *name)
char di[FILE_MAX];
BLI_split_dir_part(name, di, sizeof(di));
- /* make if if the dir doesn't exist */
+ /* make if the dir doesn't exist */
BLI_dir_create_recursive(di);
}
diff --git a/source/blender/bmesh/intern/bmesh_mods.c
b/source/blender/bmesh/intern/bmesh_mods.c
index 72d2541..6687902 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -1149,7 +1149,7 @@ BMEdge *BM_vert_collapse_edge(BMesh *bm, BMEdge *e_kill,
BMVert *v_kill,
* </pre>
*
* \param e The edge to split.
- * \param v One of the vertices in \a e and defines the the "from" end of the
splitting operation,
+ * \param v One of the vertices in \a e and defines the "from" end of the
splitting operation,
* the new vertex will be \a fac of the way from \a v to the other end.
* \param r_e The newly created edge.
* \return The new vertex.
diff --git a/source/blender/bmesh/intern/bmesh_queries.c
b/source/blender/bmesh/intern/bmesh_queries.c
index 40e0356..f301108 100644
--- a/source/blender/bmesh/intern/bmesh_queries.c
+++ b/source/blender/bmesh/intern/bmesh_queries.c
@@ -448,7 +448,7 @@ bool BM_verts_in_face(BMFace *f, BMVert **varr, int len)
}
/**
- * Returns whether or not a given edge is is part of a given face.
+ * Returns whether or not a given edge is part of a given face.
*/
bool BM_edge_in_face(BMEdge *e, BMFace *f)
{
diff --git a/source/blender/bmesh/intern/bmesh_queries_inline.h
b/source/blender/bmesh/intern/bmesh_queries_inline.h
index 6162af4..1ca56be 100644
--- a/source/blender/bmesh/intern/bmesh_queries_inline.h
+++ b/source/blender/bmesh/intern/bmesh_queries_inline.h
@@ -36,7 +36,7 @@ BLI_INLINE bool BM_vert_in_edge(const BMEdge *e, const BMVert
*v)
}
/**
- * Returns whether or not a given edge is is part of a given loop.
+ * Returns whether or not a given edge is part of a given loop.
*/
BLI_INLINE bool BM_edge_in_loop(const BMEdge *e, const BMLoop *l)
{
diff --git a/source/blender/bmesh/intern/bmesh_walkers.c
b/source/blender/bmesh/intern/bmesh_walkers.c
index 6a5efbe..20b5663 100644
--- a/source/blender/bmesh/intern/bmesh_walkers.c
+++ b/source/blender/bmesh/intern/bmesh_walkers.c
@@ -180,7 +180,7 @@ void *BMW_walk(BMWalker *walker)
* \brief Current Walker State
*
* Returns the first state from the walker state
- * worklist. This state is the the next in the
+ * worklist. This state is the next in the
* worklist for processing.
*/
void *BMW_current_state(BMWalker *walker)
diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c
b/source/blender/bmesh/intern/bmesh_walkers_impl.c
index 406dd41..c6829b8 100644
--- a/source/blender/bmesh/intern/bmesh_walkers_impl.c
+++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c
@@ -738,7 +738,7 @@ static void *bmw_LoopWalker_step(BMWalker *walker)
(owalk.is_single == false && vert_edge_tot > 2) ||
/* initial edge was a boundary, so is this edge and vertex
is only apart of this face
- * this lets us walk over the the boundary of an ngon which
is handy */
+ * this lets us walk over the boundary of an ngon which is
handy */
(owalk.is_single == true && vert_edge_tot == 2 &&
BM_edge_is_boundary(e)))
{
/* find next boundary edge in the fan */
diff --git a/source/blender/bmesh/operators/bmo_create.c
b/source/blender/bmesh/operators/bmo_create.c
index dd814fa..1c054e8 100644
--- a/source/blender/bmesh/operators/bmo_create.c
+++ b/source/blender/bmesh/operators/bmo_create.c
@@ -39,7 +39,7 @@
/* This is what runs when pressing the F key
* doing the best thing here isn't always easy create vs dissolve, its nice to
support
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
