[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59854] trunk/blender: code cleanup:
Campbell Barton
ideasman42 at gmail.com
Thu Sep 5 21:56:49 CEST 2013
Revision: 59854
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59854
Author: campbellbarton
Date: 2013-09-05 19:56:49 +0000 (Thu, 05 Sep 2013)
Log Message:
-----------
code cleanup:
- add missing headers from cmake (own omission)
- quiet rna_test.c unused define warnings.
- minor style edits
- spelling corrections and ignore all uppercase words with spell checking script.
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/blender_curves.cpp
trunk/blender/intern/cycles/kernel/kernel_bvh.h
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/blenlib/CMakeLists.txt
trunk/blender/source/blender/bmesh/bmesh.h
trunk/blender/source/blender/bmesh/bmesh_class.h
trunk/blender/source/blender/collada/MeshImporter.cpp
trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.h
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/space_graph/graph_edit.c
trunk/blender/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
trunk/blender/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
trunk/blender/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
trunk/blender/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
trunk/blender/source/blender/freestyle/intern/view_map/Functions0D.h
trunk/blender/source/blender/freestyle/intern/view_map/Functions1D.h
trunk/blender/source/blender/freestyle/intern/view_map/SteerableViewMap.h
trunk/blender/source/blender/freestyle/intern/view_map/ViewMap.h
trunk/blender/source/blender/makesrna/intern/rna_test.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/tools/spell_check_source.py
Modified: trunk/blender/intern/cycles/blender/blender_curves.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_curves.cpp 2013-09-05 19:46:41 UTC (rev 59853)
+++ trunk/blender/intern/cycles/blender/blender_curves.cpp 2013-09-05 19:56:49 UTC (rev 59854)
@@ -820,7 +820,7 @@
}
/* add hair geometry to mesh */
- if(primitive == CURVE_TRIANGLES){
+ if(primitive == CURVE_TRIANGLES) {
if(triangle_method == CURVE_CAMERA_TRIANGLES)
ExportCurveTrianglePlanes(mesh, &CData, RotCam);
else {
Modified: trunk/blender/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_bvh.h 2013-09-05 19:46:41 UTC (rev 59853)
+++ trunk/blender/intern/cycles/kernel/kernel_bvh.h 2013-09-05 19:56:49 UTC (rev 59854)
@@ -444,7 +444,7 @@
float tb = 2*(tdif.z - tg.z*(tdifz + gd*(tdifz*gd + or1)));
float tc = dot(tdif,tdif) - tdifz * tdifz * (1 + gd*gd) - or1*or1 - 2*or1*tdifz*gd;
float td = tb*tb - 4*cyla*tc;
- if (td < 0.0f){
+ if (td < 0.0f) {
tree++;
level = tree & -tree;
continue;
Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c 2013-09-05 19:46:41 UTC (rev 59853)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c 2013-09-05 19:56:49 UTC (rev 59854)
@@ -3164,7 +3164,7 @@
BKE_movieclip_get_size(clip, &user, &frame_width, &frame_height);
- /* Get an image buffer for reference frame, also gets referecnce marker.
+ /* Get an image buffer for reference frame, also gets reference marker.
*
* Usually tracking_context_get_reference_ibuf will return current frame
* if marker is keyframed, which is correct for normal tracking. But here
@@ -4057,7 +4057,7 @@
/*********************** 2D stabilization *************************/
-/* Claculate median point of markers of tracks marked as used for
+/* Calculate median point of markers of tracks marked as used for
* 2D stabilization.
*
* NOTE: frame number should be in clip space, not scene space
@@ -4414,7 +4414,7 @@
* stabilization data and used for easy coordinate
* transformation.
*
- * NOTE: The reaosn it is 4x4 matrix is because it's
+ * NOTE: The reason it is 4x4 matrix is because it's
* used for OpenGL drawing directly.
*/
void BKE_tracking_stabilization_data_to_mat4(int width, int height, float aspect,
Modified: trunk/blender/source/blender/blenlib/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenlib/CMakeLists.txt 2013-09-05 19:46:41 UTC (rev 59853)
+++ trunk/blender/source/blender/blenlib/CMakeLists.txt 2013-09-05 19:56:49 UTC (rev 59854)
@@ -99,14 +99,15 @@
intern/voxel.c
intern/winstuff.c
+ BLI_alloca.h
BLI_args.h
- BLI_alloca.h
BLI_array.h
BLI_bitmap.h
BLI_blenlib.h
+ BLI_boxpack2d.h
BLI_buffer.h
- BLI_boxpack2d.h
BLI_callbacks.h
+ BLI_compiler_attrs.h
BLI_cpu.h
BLI_dlrbTree.h
BLI_dynlib.h
@@ -150,6 +151,7 @@
BLI_smallhash.h
BLI_sort.h
BLI_stack.h
+ BLI_strict_flags.h
BLI_string.h
BLI_string_cursor_utf8.h
BLI_string_utf8.h
Modified: trunk/blender/source/blender/bmesh/bmesh.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh.h 2013-09-05 19:46:41 UTC (rev 59853)
+++ trunk/blender/source/blender/bmesh/bmesh.h 2013-09-05 19:56:49 UTC (rev 59854)
@@ -222,7 +222,7 @@
* - skip BMO flag allocation, its not needed in many cases, this is fairly redundant to calc by default.
* - ability to call BMO's with option not to create return data (will save some time)
* - binary diff UNDO, currently this uses huge amount of ram when all shapes are stored for each undo step for eg.
- * - use two differnt iterator types for BMO map/buffer types.
+ * - use two different iterator types for BMO map/buffer types.
* - avoid string lookups for BMO slot lookups _especially_ when used in loops, this is very crappy.
*
*
Modified: trunk/blender/source/blender/bmesh/bmesh_class.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_class.h 2013-09-05 19:46:41 UTC (rev 59853)
+++ trunk/blender/source/blender/bmesh/bmesh_class.h 2013-09-05 19:56:49 UTC (rev 59854)
@@ -65,7 +65,7 @@
void *data; /* customdata layers */
int index; /* notes:
* - Use BM_elem_index_get/set macros for index
- * - Unitialized to -1 so we can easily tell its not set.
+ * - Uninitialized to -1 so we can easily tell its not set.
* - Used for edge/vert/face, check BMesh.elem_index_dirty for valid index values,
* this is abused by various tools which set it dirty.
* - For loops this is used for sorting during tessellation. */
Modified: trunk/blender/source/blender/collada/MeshImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/MeshImporter.cpp 2013-09-05 19:46:41 UTC (rev 59853)
+++ trunk/blender/source/blender/collada/MeshImporter.cpp 2013-09-05 19:56:49 UTC (rev 59854)
@@ -857,7 +857,7 @@
*
* During import all materials have been assigned to Object.
* Now we iterate over the imported objects and optimize
- * the assignements as follows:
+ * the assignments as follows:
*
* for each imported geometry:
* if number of users is 1:
Modified: trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.h 2013-09-05 19:46:41 UTC (rev 59853)
+++ trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.h 2013-09-05 19:56:49 UTC (rev 59854)
@@ -189,8 +189,8 @@
BLI_assert(offset >= 0);
BLI_assert(offset < this->determineBufferSize() * COM_NUMBER_OF_CHANNELS);
- BLI_assert(!(extend_x == COM_MB_CLIP && (x < m_rect.xmin || x >= m_rect.xmax))
- && !(extend_y == COM_MB_CLIP && (y < m_rect.ymin || y >= m_rect.ymax)));
+ BLI_assert(!(extend_x == COM_MB_CLIP && (x < m_rect.xmin || x >= m_rect.xmax)) &&
+ !(extend_y == COM_MB_CLIP && (y < m_rect.ymin || y >= m_rect.ymax)));
#if 0
/* always true */
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c 2013-09-05 19:46:41 UTC (rev 59853)
+++ trunk/blender/source/blender/editors/render/render_internal.c 2013-09-05 19:56:49 UTC (rev 59854)
@@ -503,7 +503,8 @@
* - sergey -
*/
if (rj->scene->r.layers.first != rj->scene->r.layers.last ||
- rj->image_outdated) {
+ rj->image_outdated)
+ {
void *lock;
Image *ima = rj->image;
ImBuf *ibuf = BKE_image_acquire_ibuf(ima, &rj->iuser, &lock);
Modified: trunk/blender/source/blender/editors/space_graph/graph_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_edit.c 2013-09-05 19:46:41 UTC (rev 59853)
+++ trunk/blender/source/blender/editors/space_graph/graph_edit.c 2013-09-05 19:56:49 UTC (rev 59854)
@@ -882,9 +882,9 @@
delete_fcurve_keys(fcu);
/* Only delete curve too if it won't be doing anything anymore */
- if ((fcu->totvert == 0) &&
- (list_has_suitable_fmodifier(&fcu->modifiers, 0, FMI_TYPE_GENERATE_CURVE) == 0) &&
- (fcu->driver == NULL))
+ if ((fcu->totvert == 0) &&
+ (list_has_suitable_fmodifier(&fcu->modifiers, 0, FMI_TYPE_GENERATE_CURVE) == 0) &&
+ (fcu->driver == NULL))
{
ANIM_fcurve_delete_from_animdata(ac, adt, fcu);
}
Modified: trunk/blender/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
===================================================================
--- trunk/blender/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp 2013-09-05 19:46:41 UTC (rev 59853)
+++ trunk/blender/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp 2013-09-05 19:56:49 UTC (rev 59854)
@@ -44,7 +44,7 @@
"Class hierarchy: :class:`Interface1D` > :class:`ViewEdge`\n"
"\n"
"Class defining a ViewEdge. A ViewEdge in an edge of the image graph.\n"
-"it connnects two :class:`ViewVertex` objects. It is made by connecting\n"
+"it connects two :class:`ViewVertex` objects. It is made by connecting\n"
"a set of FEdges.\n"
"\n"
".. method:: __init__()\n"
Modified: trunk/blender/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
===================================================================
--- trunk/blender/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp 2013-09-05 19:46:41 UTC (rev 59853)
+++ trunk/blender/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp 2013-09-05 19:56:49 UTC (rev 59854)
@@ -48,7 +48,7 @@
" evaluation can be ambiguous (in the case of a :class:`TVertex` for\n"
" example. This functor tries to remove this ambiguity using the\n"
" context offered by the 1D element to which the Interface0DIterator\n"
-" belongs to and by arbitrary chosing the material of the face that\n"
+" belongs to and by arbitrary choosing the material of the face that\n"
" lies on its left when following the 1D element if there are two\n"
" different materials on each side of the point. However, there\n"
" still can be problematic cases, and the user willing to deal with\n"
Modified: trunk/blender/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
===================================================================
--- trunk/blender/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp 2013-09-05 19:46:41 UTC (rev 59853)
+++ trunk/blender/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp 2013-09-05 19:56:49 UTC (rev 59854)
@@ -47,7 +47,7 @@
" :class:`Interface0D` pointed by the Interface0DIterator and the\n"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list