[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34002] trunk/blender: - correct typos in comments.
Campbell Barton
ideasman42 at gmail.com
Sun Jan 2 12:06:50 CET 2011
Revision: 34002
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34002
Author: campbellbarton
Date: 2011-01-02 12:06:50 +0100 (Sun, 02 Jan 2011)
Log Message:
-----------
- correct typos in comments.
- move boxpack struct out of the public header.
Modified Paths:
--------------
trunk/blender/release/scripts/op/io_anim_bvh/export_bvh.py
trunk/blender/release/scripts/op/io_anim_bvh/import_bvh.py
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenlib/BLI_boxpack2d.h
trunk/blender/source/blender/blenlib/intern/boxpack2d.c
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/view2d.c
trunk/blender/source/blender/python/intern/bpy_rna_array.c
trunk/blender/source/blender/render/intern/source/imagetexture.c
trunk/blender/source/blender/render/intern/source/rendercore.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/release/scripts/op/io_anim_bvh/export_bvh.py
===================================================================
--- trunk/blender/release/scripts/op/io_anim_bvh/export_bvh.py 2011-01-02 10:52:21 UTC (rev 34001)
+++ trunk/blender/release/scripts/op/io_anim_bvh/export_bvh.py 2011-01-02 11:06:50 UTC (rev 34002)
@@ -131,7 +131,7 @@
"pose_imat", # pose_mat inverted
"rest_arm_imat", # rest_arm_mat inverted
"rest_local_imat", # rest_local_mat inverted
- "prev_euler", # last used euler to preserve euler compability inbetween keyframes
+ "prev_euler", # last used euler to preserve euler compability in between keyframes
)
def __init__(self, bone_name):
self.name = bone_name
Modified: trunk/blender/release/scripts/op/io_anim_bvh/import_bvh.py
===================================================================
--- trunk/blender/release/scripts/op/io_anim_bvh/import_bvh.py 2011-01-02 10:52:21 UTC (rev 34001)
+++ trunk/blender/release/scripts/op/io_anim_bvh/import_bvh.py 2011-01-02 11:06:50 UTC (rev 34002)
@@ -125,9 +125,9 @@
#print '%snode: %s, parent: %s' % (len(bvh_nodes_serial) * ' ', name, bvh_nodes_serial[-1])
- lineIdx += 2 # Incriment to the next line (Offset)
+ lineIdx += 2 # Increment to the next line (Offset)
rest_head_local = Vector((float(file_lines[lineIdx][1]), float(file_lines[lineIdx][2]), float(file_lines[lineIdx][3]))) * global_scale
- lineIdx += 1 # Incriment to the next line (Channels)
+ lineIdx += 1 # Increment to the next line (Channels)
# newChannel[Xposition, Yposition, Zposition, Xrotation, Yrotation, Zrotation]
# newChannel references indecies to the motiondata,
@@ -163,7 +163,7 @@
my_parent = bvh_nodes_serial[-1] # account for none
- # Apply the parents offset accumletivly
+ # Apply the parents offset accumulatively
if my_parent is None:
rest_head_world = Vector(rest_head_local)
else:
@@ -175,14 +175,14 @@
bvh_nodes_serial.append(bvh_node)
# Account for an end node
- if file_lines[lineIdx][0].lower() == 'end' and file_lines[lineIdx][1].lower() == 'site': # There is somtimes a name after 'End Site' but we will ignore it.
- lineIdx += 2 # Incriment to the next line (Offset)
+ if file_lines[lineIdx][0].lower() == 'end' and file_lines[lineIdx][1].lower() == 'site': # There is sometimes a name after 'End Site' but we will ignore it.
+ lineIdx += 2 # Increment to the next line (Offset)
rest_tail = Vector((float(file_lines[lineIdx][1]), float(file_lines[lineIdx][2]), float(file_lines[lineIdx][3]))) * global_scale
bvh_nodes_serial[-1].rest_tail_world = bvh_nodes_serial[-1].rest_head_world + rest_tail
bvh_nodes_serial[-1].rest_tail_local = bvh_nodes_serial[-1].rest_head_local + rest_tail
- # Just so we can remove the Parents in a uniform way- End end never has kids
+ # Just so we can remove the Parents in a uniform way- End has kids
# so this is a placeholder
bvh_nodes_serial.append(None)
Modified: trunk/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mball.c 2011-01-02 10:52:21 UTC (rev 34001)
+++ trunk/blender/source/blender/blenkernel/intern/mball.c 2011-01-02 11:06:50 UTC (rev 34002)
@@ -737,7 +737,7 @@
void *new_pgn_element(int size)
{
/* during polygonize 1000s of elements are allocated
- * and never freed inbetween. Freeing only done at the end.
+ * and never freed in between. Freeing only done at the end.
*/
int blocksize= 16384;
static int offs= 0; /* the current free address */
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2011-01-02 10:52:21 UTC (rev 34001)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2011-01-02 11:06:50 UTC (rev 34002)
@@ -350,7 +350,7 @@
pa->num_dmcache= GET_INT_FROM_POINTER(nodearray[pa->num]->link);
}
else { /* FROM_FACE/FROM_VOLUME */
- /* Note that somtimes the pa->num is over the nodearray size, this is bad, maybe there is a better place to fix this,
+ /* Note that sometimes the pa->num is over the nodearray size, this is bad, maybe there is a better place to fix this,
* but for now passing NULL is OK. every face will be searched for the particle so its slower - Campbell */
pa->num_dmcache= psys_particle_dm_face_lookup(ob, dm, pa->num, pa->fuv, pa->num < totelem ? nodearray[pa->num] : NULL);
}
Modified: trunk/blender/source/blender/blenlib/BLI_boxpack2d.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_boxpack2d.h 2011-01-02 10:52:21 UTC (rev 34001)
+++ trunk/blender/source/blender/blenlib/BLI_boxpack2d.h 2011-01-02 11:06:50 UTC (rev 34002)
@@ -29,24 +29,6 @@
/* Box Packer */
-/* verts, internal use only */
-typedef struct boxVert {
- float x;
- float y;
- short free;
-
- struct boxPack *trb; /* top right box */
- struct boxPack *blb; /* bottom left box */
- struct boxPack *brb; /* bottom right box */
- struct boxPack *tlb; /* top left box */
-
- /* Store last intersecting boxes here
- * speedup intersection testing */
- struct boxPack *isect_cache[4];
-
- int index;
-} boxVert;
-
typedef struct boxPack {
float x;
float y;
@@ -56,7 +38,7 @@
/* Verts this box uses
* (BL,TR,TL,BR) / 0,1,2,3 */
- boxVert *v[4];
+ struct boxVert *v[4];
} boxPack;
void boxPack2D(boxPack *boxarray, int len, float *tot_width, float *tot_height);
Modified: trunk/blender/source/blender/blenlib/intern/boxpack2d.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/boxpack2d.c 2011-01-02 10:52:21 UTC (rev 34001)
+++ trunk/blender/source/blender/blenlib/intern/boxpack2d.c 2011-01-02 11:06:50 UTC (rev 34002)
@@ -30,6 +30,23 @@
*
* The defined Below are for internal use only */
+typedef struct boxVert {
+ float x;
+ float y;
+ short free;
+
+ struct boxPack *trb; /* top right box */
+ struct boxPack *blb; /* bottom left box */
+ struct boxPack *brb; /* bottom right box */
+ struct boxPack *tlb; /* top left box */
+
+ /* Store last intersecting boxes here
+ * speedup intersection testing */
+ struct boxPack *isect_cache[4];
+
+ int index;
+} boxVert;
+
/* free vert flags */
#define eps 0.0000001f
#define BLF 1
Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_interface.h 2011-01-02 10:52:21 UTC (rev 34001)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2011-01-02 11:06:50 UTC (rev 34002)
@@ -271,7 +271,7 @@
*
* Functions used to create popup menus. For more extended menus the
* uiPupMenuBegin/End functions can be used to define own items with
- * the uiItem functions inbetween. If it is a simple confirmation menu
+ * the uiItem functions in between. If it is a simple confirmation menu
* or similar, popups can be created with a single function call. */
typedef struct uiPopupMenu uiPopupMenu;
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2011-01-02 10:52:21 UTC (rev 34001)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2011-01-02 11:06:50 UTC (rev 34002)
@@ -4830,7 +4830,7 @@
/* we disable auto_open in the block after a threshold, because we still
* want to allow auto opening adjacent menus even if no button is activated
- * inbetween going over to the other button, but only for a short while */
+ * in between going over to the other button, but only for a short while */
if(type == BUTTON_ACTIVATE_OVER && but->block->auto_open)
if(but->block->auto_open_last+BUTTON_AUTO_OPEN_THRESH < PIL_check_seconds_timer())
but->block->auto_open= 0;
Modified: trunk/blender/source/blender/editors/interface/view2d.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d.c 2011-01-02 10:52:21 UTC (rev 34001)
+++ trunk/blender/source/blender/editors/interface/view2d.c 2011-01-02 11:06:50 UTC (rev 34002)
@@ -1073,7 +1073,7 @@
/* for frames, we want 1.0 frame intervals only */
if (unit == V2D_UNIT_FRAMES) {
rem = 1.0f;
- *step = 2.0f; /* use 2 since there are grid lines drawn inbetween, this way to get 1 line per frane */
+ *step = 2.0f; /* use 2 since there are grid lines drawn in between, this way to get 1 line per frane */
}
/* prevents printing 1.0 2.0 3.0 etc */
Modified: trunk/blender/source/blender/python/intern/bpy_rna_array.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna_array.c 2011-01-02 10:52:21 UTC (rev 34001)
+++ trunk/blender/source/blender/python/intern/bpy_rna_array.c 2011-01-02 11:06:50 UTC (rev 34002)
@@ -450,7 +450,7 @@
return NULL;
}
- PyTuple_SetItem(tuple, i, item);
+ PyTuple_SET_ITEM(tuple, i, item);
}
return tuple;
Modified: trunk/blender/source/blender/render/intern/source/imagetexture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/imagetexture.c 2011-01-02 10:52:21 UTC (rev 34001)
+++ trunk/blender/source/blender/render/intern/source/imagetexture.c 2011-01-02 11:06:50 UTC (rev 34002)
@@ -808,7 +808,7 @@
static void ewa_eval(TexResult* texr, ImBuf* ibuf, float fx, float fy, afdata_t* AFD)
{
// scaling dxt/dyt by full resolution can cause overflow because of huge A/B/C and esp. F values,
- // scaling by aspect ratio alone does the opposite, so try something inbetween instead...
+ // scaling by aspect ratio alone does the opposite, so try something in between instead...
const float ff2 = ibuf->x, ff = sqrtf(ff2), q = ibuf->y / ff;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list