griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

typo's and some style cleanup, also added asserts into BLI_vsnprintf and BLI_sprintfN when invalid args are given.

Browse Source
This commit is contained in:
Campbell Barton
2012-11-28 06:43:04 +00:00
parent 71e7f9028f
commit 0b9be70591
15 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/modules/bl_i18n_utils/update_trunk.py
View File

@@ -115,7 +115,7 @@ def main():
if not os.path.exists(os.path.join(TRUNK_PO_DIR, ".".join((lang, "po")))):
failed.add(lang)
# Check and compile each po separatly, to keep track of those failing.
# Check and compile each po separately, to keep track of those failing.
# XXX There should not be any failing at this stage, import step is
# supposed to have already filtered them out!
for po in os.listdir(TRUNK_PO_DIR):

2
release/scripts/modules/bpy_types.py
View File

@@ -394,7 +394,7 @@ class Mesh(bpy_types.ID):
p.vertices = f
loop_index += loop_len
# if no edges - calculae them
# if no edges - calculate them
if faces and (not edges):
self.update(calc_edges=True)

2
release/scripts/modules/rna_xml.py
View File

@@ -178,7 +178,7 @@ def rna2xml(fw=print_ln,
fw("%s</%s>\n" % (ident, value_type_name))
# -------------------------------------------------------------------------
# needs re-workign to be generic
# needs re-working to be generic
if root_node:
fw("%s<%s>\n" % (root_ident, root_node))

2
release/scripts/startup/bl_operators/uvcalc_lightmap.py
View File

@@ -552,7 +552,7 @@ class LightMapPack(Operator):
# Disable REGISTER flag for now because this operator might create new
# images. This leads to non-proper operator redo because current undo
# stack is local for edit mode and can not remove images created by this
# oprtator.
# operator.
# Proper solution would be to make undo stack aware of such things,
# but for now just disable redo. Keep undo here so unwanted changes to uv
# coords might be undone.

2
release/scripts/startup/bl_operators/uvcalc_smart_project.py
View File

@@ -993,7 +993,7 @@ def main(context,
if mostUniqueAngle < USER_PROJECTION_LIMIT_CONVERTED:
#print 'adding', mostUniqueAngle, USER_PROJECTION_LIMIT, len(newProjectMeshFaces)
# Now weight the vector to all its faces, will give a more direct projection
# if the face its self was not representive of the normal from surrounding faces.
# if the face its self was not representative of the normal from surrounding faces.
newProjectVec = tempMeshFaces[mostUniqueIndex].no
newProjectMeshFaces = [tempMeshFaces.pop(mostUniqueIndex)]

6
source/blender/blenlib/intern/string.c
View File

@@ -85,6 +85,10 @@ size_t BLI_vsnprintf(char *__restrict buffer, size_t count, const char *__restri
{
size_t n;
BLI_assert(buffer != NULL);
BLI_assert(count > 0);
BLI_assert(format != NULL);
n = vsnprintf(buffer, count, format, arg);
if (n != -1 && n < count) {
@@ -115,6 +119,8 @@ char *BLI_sprintfN(const char *__restrict format, ...)
va_list arg;
char *n;
BLI_assert(format != NULL);
va_start(arg, format);
ds = BLI_dynstr_new();

2
source/blender/bmesh/tools/bmesh_decimate_collapse.c
View File

@@ -878,7 +878,7 @@ static void bm_decim_edge_collapse(BMesh *bm, BMEdge *e,
int i;
if (vweights) {
vweights[BM_elem_index_get(v_other)] = vweights[v_clear_index] + vweights[BM_elem_index_get(v_other)];
vweights[BM_elem_index_get(v_other)] += vweights[v_clear_index];
}
e = NULL; /* paranoid safety check */

6
source/blender/compositor/intern/COM_ExecutionGroup.h
View File

@@ -193,7 +193,7 @@ private:
/**
* @brief try to schedule a specific chunk.
* @note scheduling succeeds when all input requirements are met and the chunks hasen't been scheduled yet.
* @note scheduling succeeds when all input requirements are met and the chunks hasn't been scheduled yet.
* @param graph
* @param xChunk
* @param yChunk
@@ -245,7 +245,7 @@ public:
/**
* @brief add an operation to this ExecutionGroup
* @note this method will add input of the operations recursivly
* @note this method will add input of the operations recursively
* @note this method can create multiple ExecutionGroup's
* @param system
* @param operation
@@ -369,7 +369,7 @@ public:
/**
* @brief this method determines the MemoryProxy's where this execution group depends on.
* @note After this method determineDependingAreaOfInterest can be called to determine
* @note the area of the MemoryProxy.creator thas has to be executed.
* @note the area of the MemoryProxy.creator that has to be executed.
* @param memoryProxies result
*/
void determineDependingMemoryProxies(vector<MemoryProxy *> *memoryProxies);

2
source/blender/editors/mesh/editmesh_loopcut.c
View File

@@ -332,7 +332,7 @@ static void ringsel_finish(bContext *C, wmOperator *op)
smoothness, 0.0f, 0.0f,
cuts,
SUBDIV_SELECT_LOOPCUT, SUBD_PATH, 0, TRUE,
use_only_quads, 0);
use_only_quads, 0);
/* force edge slide to edge select mode in in face select mode */
if (em->selectmode & SCE_SELECT_FACE) {

2
source/blender/editors/mesh/editmesh_rip.c
View File

@@ -60,7 +60,7 @@
*
* \param inset is used so we get some useful distance
* when comparing multiple edges that meet at the same
* point and would result in teh same distance.
* point and would result in the same distance.
*/
#define INSET_DEFAULT 0.00001f
static float edbm_rip_edgedist(ARegion *ar, float mat[][4],

2
source/blender/editors/sculpt_paint/paint_image.c
View File

@@ -656,7 +656,7 @@ static float VecZDepthPersp(const float pt[2],
* barycentric_weights_v2 would return, in this case its easiest just to
* undo the 4th axis division and make it unit-sum
*
* don't call barycentric_weights_v2() becaue our callers expect 'w'
* don't call barycentric_weights_v2() because our callers expect 'w'
* to be weighted from the perspective */
w_tmp[0] = w[0] * v1[3];
w_tmp[1] = w[1] * v2[3];

2
source/blender/editors/space_outliner/outliner_tree.c
View File

@@ -133,7 +133,7 @@ static void outliner_storage_cleanup(SpaceOops *soops)
}
/* XXX - THIS FUNCTION IS INCREDIBLY SLOW
* ... it can bring blenders tools and viewport to a grinding halt becuase of searching
* ... it can bring blenders tools and viewport to a grinding halt because of searching
* for duplicate items every times they are added.
*
* TODO (possible speedups)

2
source/blender/editors/transform/transform_conversions.c
View File

@@ -938,7 +938,7 @@ static short pose_grab_with_ik(Object *ob)
}
/* iTaSC needs clear for new IK constraints */
if(tot_ik)
if (tot_ik)
BIK_clear_data(ob->pose);
return (tot_ik) ? 1 : 0;

2
source/blender/ikplugin/intern/ikplugin_api.c
View File

@@ -86,7 +86,7 @@ static IKPlugin ikplugin_tab[] = {
static IKPlugin *get_plugin(bPose *pose)
{
if (!pose || pose->iksolver < 0 || pose->iksolver > (sizeof(ikplugin_tab)/sizeof(IKPlugin) - 2))
if (!pose || pose->iksolver < 0 || pose->iksolver > (sizeof(ikplugin_tab) / sizeof(IKPlugin) - 2))
return NULL;
return &ikplugin_tab[pose->iksolver];

2
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -1215,7 +1215,7 @@ static int wm_operator_props_popup_ex(bContext *C, wmOperator *op, const int do_
/* if we don't have global undo, we can't do undo push for automatic redo,
* so we require manual OK clicking in this popup */
if(!(U.uiflag & USER_GLOBALUNDO))
if (!(U.uiflag & USER_GLOBALUNDO))
return WM_operator_props_dialog_popup(C, op, 300, UI_UNIT_Y);
ED_undo_push_op(C, op);