[Bf-blender-cvs] [bba80ed] master: Cleanup
Campbell Barton
noreply at git.blender.org
Sun Aug 17 04:19:09 CEST 2014
Commit: bba80ed7afa8ccea14310f35f767749f5d04207e
Author: Campbell Barton
Date: Sun Aug 17 12:18:40 2014 +1000
Branches: master
https://developer.blender.org/rBbba80ed7afa8ccea14310f35f767749f5d04207e
Cleanup
===================================================================
M intern/cycles/util/util_cache.h
M intern/ghost/intern/GHOST_DropTargetX11.h
M source/blender/blenlib/intern/scanfill.c
M source/blender/bmesh/operators/bmo_smooth_laplacian.c
M source/blender/collada/ControllerExporter.cpp
M source/blender/editors/render/render_internal.c
M source/blender/editors/space_image/image_ops.c
M source/blender/freestyle/intern/view_map/SteerableViewMap.h
M source/blender/imbuf/intern/colormanagement.c
M source/gameengine/Converter/BL_ShapeActionActuator.h
===================================================================
diff --git a/intern/cycles/util/util_cache.h b/intern/cycles/util/util_cache.h
index 417f4a8..c6752d9 100644
--- a/intern/cycles/util/util_cache.h
+++ b/intern/cycles/util/util_cache.h
@@ -25,7 +25,7 @@
* again into the appropriate data structures.
*
* This way we do not need to accurately track changes, compare dates and
- * invalidate cache entries, at the cost of exta computation. If everything
+ * invalidate cache entries, at the cost of extra computation. If everything
* is stored in a global cache, computations can perhaps even be shared between
* different scenes where it may be hard to detect duplicate work.
*/
diff --git a/intern/ghost/intern/GHOST_DropTargetX11.h b/intern/ghost/intern/GHOST_DropTargetX11.h
index 4670c2e..e296884 100644
--- a/intern/ghost/intern/GHOST_DropTargetX11.h
+++ b/intern/ghost/intern/GHOST_DropTargetX11.h
@@ -78,7 +78,7 @@ private:
void Initialize(void);
/**
- * Uninitiailize XDND and all related X atoms
+ * Uninitialize XDND and all related X atoms
*/
void Uninitialize(void);
diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c
index 3d3dfee..cf0d8cf 100644
--- a/source/blender/blenlib/intern/scanfill.c
+++ b/source/blender/blenlib/intern/scanfill.c
@@ -867,7 +867,7 @@ unsigned int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const int flag, const
* which historically this function supports so better not change */
/* warning: this only gives stable direction with single polygons,
- * ideally we'd calcualte connectivity and calculate each polys normal, see T41047 */
+ * ideally we'd calculate connectivity and each polys normal, see T41047 */
const float *v_prev;
zero_v3(n);
diff --git a/source/blender/bmesh/operators/bmo_smooth_laplacian.c b/source/blender/bmesh/operators/bmo_smooth_laplacian.c
index af5f35f..a250c71 100644
--- a/source/blender/bmesh/operators/bmo_smooth_laplacian.c
+++ b/source/blender/bmesh/operators/bmo_smooth_laplacian.c
@@ -156,7 +156,7 @@ static LaplacianSystem *init_laplacian_system(int a_numEdges, int a_numFaces, in
return sys;
}
-/* Compute weigth between vertice v_i and all your neighbors
+/* Compute weight between vertice v_i and all your neighbors
* weight between v_i and v_neighbor
* Wij = cot(alpha) + cot(beta) / (4.0 * total area of all faces * sum all weight)
* v_i *
diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp
index e34161f..bc1c417 100644
--- a/source/blender/collada/ControllerExporter.cpp
+++ b/source/blender/collada/ControllerExporter.cpp
@@ -284,7 +284,7 @@ void ControllerExporter::export_skin_controller(Object *ob, Object *ob_arm)
}
if (oob_counter > 0) {
- fprintf(stderr, "Ignored %d Vertex weigths which use index to non existing VGroup %ld.\n", oob_counter, joint_index_by_def_index.size());
+ fprintf(stderr, "Ignored %d Vertex weights which use index to non existing VGroup %ld.\n", oob_counter, joint_index_by_def_index.size());
}
}
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index e2d4af4..7eb3b5f 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -1202,7 +1202,7 @@ static void render_view3d_startjob(void *customdata, short *stop, short *do_upda
float mat[4][4];
mul_m4_m4m4(mat, rp->viewmat, object->obmat);
invert_m4_m4(object->imat_ren, mat);
- }
+ }
}
use_border = render_view3d_disprect(rp->scene, rp->ar, rp->v3d,
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 7344d40..f402f1c 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1486,7 +1486,9 @@ static bool save_image_doit(bContext *C, SpaceImage *sima, wmOperator *op, SaveI
else {
/* TODO, better solution, if a 24bit image is painted onto it may contain alpha */
if ((simopts->im_format.planes == R_IMF_PLANES_RGBA) &&
- (ibuf->userflags & IB_BITMAPDIRTY)) { /* it has been painted onto */
+ /* it has been painted onto */
+ (ibuf->userflags & IB_BITMAPDIRTY))
+ {
/* checks each pixel, not ideal */
ibuf->planes = BKE_imbuf_alpha_test(ibuf) ? R_IMF_PLANES_RGBA : R_IMF_PLANES_RGB;
}
diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.h b/source/blender/freestyle/intern/view_map/SteerableViewMap.h
index 0cd5d22..3a66062 100644
--- a/source/blender/freestyle/intern/view_map/SteerableViewMap.h
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.h
@@ -54,7 +54,7 @@ class GrayImage;
class SteerableViewMap
{
protected:
- // for each vector the list of nbOrientations weigths corresponding to its contributions
+ // for each vector the list of nbOrientations weights corresponding to its contributions
// to the nbOrientations directional maps
map<unsigned int, double*> _mapping;
unsigned _nbOrientations;
@@ -73,7 +73,7 @@ public:
virtual void Reset();
/*! Adds a FEdge to steerable VM.
- * Returns the nbOrientations weigths corresponding to the FEdge contributions to the nbOrientations
+ * Returns the nbOrientations weights corresponding to the FEdge contributions to the nbOrientations
* directional maps.
*/
double *AddFEdge(FEdge *iFEdge);
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index 696e34e..06dd128 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -3044,7 +3044,7 @@ static void update_glsl_display_processor(const ColorManagedViewSettings *view_s
global_glsl_state.exposure = view_settings->exposure;
global_glsl_state.gamma = view_settings->gamma;
- /* We're using curve mapping's address as a acache ID,
+ /* We're using curve mapping's address as a cache ID,
* so we need to make sure re-allocation gives new address here.
* We do this by allocating new curve mapping before freeing ol one.
*/
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.h b/source/gameengine/Converter/BL_ShapeActionActuator.h
index f72275b..e96d0e0 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.h
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.h
@@ -59,7 +59,7 @@ public:
virtual void ProcessReplica();
void SetBlendTime (float newtime);
- void BlendShape(struct Key* key, float weigth);
+ void BlendShape(struct Key* key, float weight);
bAction* GetAction() { return m_action; }
void SetAction(bAction* act) { m_action= act; }
More information about the Bf-blender-cvs
mailing list