Commit: fc9505c9c5d513bc756f147dff4509a05123dc71
Author: Campbell Barton
Date: Wed Dec 2 13:15:52 2015 +1100
Branches: master
https://developer.blender.org/rBfc9505c9c5d513bc756f147dff4509a05123dc71
Cleanup: warnings & spelling
===================================================================
M extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
M intern/cycles/kernel/geom/geom_qbvh.h
M intern/cycles/render/graph.cpp
M intern/cycles/util/util_math_fast.h
M source/blender/bmesh/tools/bmesh_path.c
M source/blender/modifiers/intern/MOD_weightvgproximity.c
===================================================================
diff --git a/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
b/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
index 6a3ade8..1a8bf7a 100644
--- a/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
+++ b/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
@@ -197,7 +197,7 @@ class CameraIntrinsics {
double *normalized_x,
double *normalized_y) const = 0;
- // Distort an image using the current camera instrinsics
+ // Distort an image using the current camera intrinsics
//
// The distorted image is computed in output_buffer using samples from
// input_buffer. Both buffers should be width x height x channels sized.
@@ -226,7 +226,7 @@ class CameraIntrinsics {
int channels,
PixelType *output_buffer);
- // Undistort an image using the current camera instrinsics
+ // Undistort an image using the current camera intrinsics
//
// The undistorted image is computed in output_buffer using samples from
// input_buffer. Both buffers should be width x height x channels sized.
diff --git a/intern/cycles/kernel/geom/geom_qbvh.h
b/intern/cycles/kernel/geom/geom_qbvh.h
index 37deaac..2a2d782 100644
--- a/intern/cycles/kernel/geom/geom_qbvh.h
+++ b/intern/cycles/kernel/geom/geom_qbvh.h
@@ -19,7 +19,7 @@ struct QBVHStackItem {
float dist;
};
-/* TOOD(sergey): Investigate if using instrinsics helps for both
+/* TOOD(sergey): Investigate if using intrinsics helps for both
* stack item swap and float comparison.
*/
ccl_device_inline void qbvh_item_swap(QBVHStackItem *__restrict a,
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp
index 2977555..ffd9962 100644
--- a/intern/cycles/render/graph.cpp
+++ b/intern/cycles/render/graph.cpp
@@ -631,7 +631,7 @@ void ShaderGraph::break_cycles(ShaderNode *node,
vector<bool>& visited, vector<b
void ShaderGraph::clean(Scene *scene)
{
/* Graph simplification:
- * 1: Remove unnecesarry nodes
+ * 1: Remove unnecessary nodes
* 2: Constant folding
* 3: Simplification
* 4: De-duplication
diff --git a/intern/cycles/util/util_math_fast.h
b/intern/cycles/util/util_math_fast.h
index 867de78..efe0698 100644
--- a/intern/cycles/util/util_math_fast.h
+++ b/intern/cycles/util/util_math_fast.h
@@ -247,7 +247,7 @@ ccl_device float fast_sinpif(float x)
* The basic idea of this approximation starts with the coarse
approximation:
* sin(pi*x) ~= f(x) = 4 * (x - x * abs(x))
*
- * This approximation always _over_ estimates the target. On the
otherhand,
+ * This approximation always _over_ estimates the target. On the other
hand,
* the curve:
* sin(pi*x) ~= f(x) * abs(f(x)) / 4
*
diff --git a/source/blender/bmesh/tools/bmesh_path.c
b/source/blender/bmesh/tools/bmesh_path.c
index 1c05b8a..bc9ab08 100644
--- a/source/blender/bmesh/tools/bmesh_path.c
+++ b/source/blender/bmesh/tools/bmesh_path.c
@@ -316,10 +316,10 @@ static float facetag_cut_cost(BMFace *f_a, BMFace *f_b,
BMEdge *e)
float ix_e[3], ix_f[3], f;
isect_line_line_v3(e->v1->co, e->v2->co, f_a_cent, f_b_cent,
ix_e, ix_f);
f = line_point_factor_v3(ix_e, e->v1->co, e->v2->co);
- if (f < 0.0) {
+ if (f < 0.0f) {
copy_v3_v3(e_cent, e->v1->co);
}
- else if (f > 1.0) {
+ else if (f > 1.0f) {
copy_v3_v3(e_cent, e->v2->co);
}
else {
diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c
b/source/blender/modifiers/intern/MOD_weightvgproximity.c
index 29a5e2d..0a73a18 100644
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@@ -136,7 +136,7 @@ static void get_vert2geom_distance(int numVerts, float
(*v_cos)[3],
DerivedMesh *target, const SpaceTransform
*loc2trgt)
{
Vert2GeomData data = {0};
- Vert2GeomDataChunk data_chunk = {0};
+ Vert2GeomDataChunk data_chunk = {{{0}}};
BVHTreeFromMesh treeData_v = {NULL};
BVHTreeFromMesh treeData_e = {NULL};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
