[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54355] trunk/blender: style cleanup: some warnigs & spelling.
Campbell Barton
ideasman42 at gmail.com
Wed Feb 6 15:02:19 CET 2013
Revision: 54355
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54355
Author: campbellbarton
Date: 2013-02-06 14:02:19 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
style cleanup: some warnigs & spelling.
Modified Paths:
--------------
trunk/blender/intern/cycles/render/session.cpp
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/nla.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/rigidbody.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/compositor/nodes/COM_TranslateNode.cpp
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_file/filesel.c
trunk/blender/source/blender/makesrna/intern/rna_image_api.c
trunk/blender/source/blender/python/intern/bpy_interface.c
Modified: trunk/blender/intern/cycles/render/session.cpp
===================================================================
--- trunk/blender/intern/cycles/render/session.cpp 2013-02-06 13:59:54 UTC (rev 54354)
+++ trunk/blender/intern/cycles/render/session.cpp 2013-02-06 14:02:19 UTC (rev 54355)
@@ -552,7 +552,7 @@
}
else if(need_tonemap) {
/* tonemap only if we do not reset, we don't we don't
- * wan't to show the result of an incomplete sample*/
+ * want to show the result of an incomplete sample*/
tonemap();
}
Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c 2013-02-06 13:59:54 UTC (rev 54354)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c 2013-02-06 14:02:19 UTC (rev 54355)
@@ -656,7 +656,7 @@
* available. my ussual solution to this is to use the
* ratio of change of the size to change the unprojected
* radius. Not completely convinced that is correct.
- * In anycase, a better solution is needed to prevent
+ * In any case, a better solution is needed to prevent
* inconsistency. */
void BKE_brush_size_set(Scene *scene, Brush *brush, int size)
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2013-02-06 13:59:54 UTC (rev 54354)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2013-02-06 14:02:19 UTC (rev 54355)
@@ -759,7 +759,7 @@
/* this modifiers are moving point of tessellation automatically
* (some of them even can't be applied on tessellated curve), set flag
- * for incformation button in modifier's header
+ * for information button in modifier's header
*/
md->mode |= eModifierMode_ApplyOnSpline;
}
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2013-02-06 13:59:54 UTC (rev 54354)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2013-02-06 14:02:19 UTC (rev 54355)
@@ -248,6 +248,7 @@
totfilltri = BLI_scanfill_calc_ex(&sf_ctx, 0, efa->no);
BLI_assert(totfilltri <= efa->len - 2);
+ (void)totfilltri;
for (sf_tri = sf_ctx.fillfacebase.first; sf_tri; sf_tri = sf_tri->next) {
BMLoop **l_ptr = looptris[i++];
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2013-02-06 13:59:54 UTC (rev 54354)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2013-02-06 14:02:19 UTC (rev 54355)
@@ -2579,6 +2579,7 @@
totfilltri = BLI_scanfill_calc(&sf_ctx, 0);
BLI_assert(totfilltri <= mp->totloop - 2);
+ (void)totfilltri;
for (sf_tri = sf_ctx.fillfacebase.first; sf_tri; sf_tri = sf_tri->next, mf++) {
mface_to_poly_map[mface_index] = poly_index;
Modified: trunk/blender/source/blender/blenkernel/intern/nla.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/nla.c 2013-02-06 13:59:54 UTC (rev 54354)
+++ trunk/blender/source/blender/blenkernel/intern/nla.c 2013-02-06 14:02:19 UTC (rev 54355)
@@ -1447,9 +1447,9 @@
if (strip->extendmode != NLASTRIP_EXTEND_NOTHING) {
/* 1) First strip must be set to extend hold, otherwise, stuff before acts dodgy
* 2) Only overwrite extend mode if *not* changing it will most probably result in
- * occlusion problems, which will occur iff
- * - blendmode = REPLACE
- * - all channels the same (this is fiddly to test, so is currently assumed)
+ * occlusion problems, which will occur if...
+ * - blendmode = REPLACE
+ * - all channels the same (this is fiddly to test, so is currently assumed)
*
* Should fix problems such as [#29869]
*/
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2013-02-06 13:59:54 UTC (rev 54354)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2013-02-06 14:02:19 UTC (rev 54355)
@@ -1275,7 +1275,7 @@
if (scene && (duplis-- > 0) && (ob->transflag & OB_DUPLI)) {
ListBase *lb_dupli_ob;
- /* don't update the dupli groups, we only wan't their pid's */
+ /* don't update the dupli groups, we only want their pid's */
if ((lb_dupli_ob = object_duplilist_ex(scene, ob, FALSE, FALSE))) {
DupliObject *dob;
for (dob= lb_dupli_ob->first; dob; dob= dob->next) {
Modified: trunk/blender/source/blender/blenkernel/intern/rigidbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/rigidbody.c 2013-02-06 13:59:54 UTC (rev 54354)
+++ trunk/blender/source/blender/blenkernel/intern/rigidbody.c 2013-02-06 14:02:19 UTC (rev 54355)
@@ -354,7 +354,7 @@
/* if automatically determining dimensions, use the Object's boundbox
* - assume that all quadrics are standing upright on local z-axis
* - assume even distribution of mass around the Object's pivot
- * (i.e. Object pivot is centralised in boundbox)
+ * (i.e. Object pivot is centralized in boundbox)
*/
// XXX: all dimensions are auto-determined now... later can add stored settings for this
/* get object dimensions without scaling */
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2013-02-06 13:59:54 UTC (rev 54354)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2013-02-06 14:02:19 UTC (rev 54355)
@@ -716,7 +716,7 @@
}
/* used by metaballs
- * doesnt return the original duplicated object, only dupli's
+ * doesn't return the original duplicated object, only dupli's
*/
int BKE_scene_base_iter_next(Scene **scene, int val, Base **base, Object **ob)
{
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2013-02-06 13:59:54 UTC (rev 54354)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2013-02-06 14:02:19 UTC (rev 54355)
@@ -245,7 +245,7 @@
BM_mesh_data_free(bm);
if (bm->py_handle) {
- /* keep this out of 'BM_mesh_data_free' because we wan't python
+ /* keep this out of 'BM_mesh_data_free' because we want python
* to be able to clear the mesh and maintain access. */
extern void bpy_bm_generic_invalidate(void *self);
Modified: trunk/blender/source/blender/compositor/nodes/COM_TranslateNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_TranslateNode.cpp 2013-02-06 13:59:54 UTC (rev 54354)
+++ trunk/blender/source/blender/compositor/nodes/COM_TranslateNode.cpp 2013-02-06 14:02:19 UTC (rev 54355)
@@ -48,7 +48,8 @@
inputSocket->relinkConnections(wrapOperation->getInputSocket(0), 0, graph);
addLink(graph, wrapOperation->getOutputSocket(), operation->getInputSocket(0));
graph->addOperation(wrapOperation);
- } else {
+ }
+ else {
inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
}
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-02-06 13:59:54 UTC (rev 54354)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-02-06 14:02:19 UTC (rev 54355)
@@ -6973,7 +6973,7 @@
retval = ui_handle_menu_return_submenu(C, event, menu);
submenu = NULL; /* hint not to use this, it may be freed by call above */
(void)submenu;
- /* we may wan't to quit the submenu and handle the even in this menu,
+ /* we may want to quit the submenu and handle the even in this menu,
* if its important to use it, check 'data->menu' first */
if ((retval == WM_UI_HANDLER_BREAK) && do_ret_out_parent) {
retval = ui_handle_menu_event(C, event, menu, level);
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2013-02-06 13:59:54 UTC (rev 54354)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2013-02-06 14:02:19 UTC (rev 54355)
@@ -360,7 +360,7 @@
/**
* \brief check for pose mode (no mixed modes)
*
- * We wan't to enable most pose operations in weight paint mode,
+ * We want to enable most pose operations in weight paint mode,
* when it comes to transforming bones, but managing bomes layers/groups
* can be left for pose mode only. (not weight paint mode)
*/
Modified: trunk/blender/source/blender/editors/space_file/filesel.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filesel.c 2013-02-06 13:59:54 UTC (rev 54354)
+++ trunk/blender/source/blender/editors/space_file/filesel.c 2013-02-06 14:02:19 UTC (rev 54355)
@@ -95,7 +95,7 @@
}
/**
- * \note RNA_struct_property_is_set_ex is used here because we wan't
+ * \note RNA_struct_property_is_set_ex is used here because we want
* the previously used settings to be used here rather then overriding them */
short ED_fileselect_set_params(SpaceFile *sfile)
{
Modified: trunk/blender/source/blender/makesrna/intern/rna_image_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_image_api.c 2013-02-06 13:59:54 UTC (rev 54354)
+++ trunk/blender/source/blender/makesrna/intern/rna_image_api.c 2013-02-06 14:02:19 UTC (rev 54355)
@@ -318,9 +318,9 @@
RNA_def_function_ui_description(func, "Delay the image from being cleaned from the cache due inactivity");
RNA_def_function_flag(func, FUNC_USE_REPORTS);
RNA_def_int(func, "filter", GL_LINEAR_MIPMAP_NEAREST, -INT_MAX, INT_MAX, "Filter",
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list