spelling correction: alredy --> already
This commit is contained in:
@@ -601,7 +601,7 @@ void btConeTwistConstraint::calcAngleInfo2()
|
|||||||
m_solveSwingLimit = false;
|
m_solveSwingLimit = false;
|
||||||
// compute rotation of A wrt B (in constraint space)
|
// compute rotation of A wrt B (in constraint space)
|
||||||
if (m_bMotorEnabled && (!m_useSolveConstraintObsolete))
|
if (m_bMotorEnabled && (!m_useSolveConstraintObsolete))
|
||||||
{ // it is assumed that setMotorTarget() was alredy called
|
{ // it is assumed that setMotorTarget() was already called
|
||||||
// and motor target m_qTarget is within constraint limits
|
// and motor target m_qTarget is within constraint limits
|
||||||
// TODO : split rotation to pure swing and pure twist
|
// TODO : split rotation to pure swing and pure twist
|
||||||
// compute desired transforms in world
|
// compute desired transforms in world
|
||||||
|
@@ -1006,7 +1006,7 @@ def save_3ds(filename, context):
|
|||||||
mat = mat_ls[mat_index]
|
mat = mat_ls[mat_index]
|
||||||
if mat: mat_name = mat.name
|
if mat: mat_name = mat.name
|
||||||
else: mat_name = None
|
else: mat_name = None
|
||||||
# else there alredy set to none
|
# else there already set to none
|
||||||
|
|
||||||
img = uf.image
|
img = uf.image
|
||||||
# img = f.image
|
# img = f.image
|
||||||
|
@@ -83,7 +83,7 @@ def copy_images(dest_dir, textures):
|
|||||||
if Blender.sys.exists(image_path):
|
if Blender.sys.exists(image_path):
|
||||||
# Make a name for the target path.
|
# Make a name for the target path.
|
||||||
dest_image_path = dest_dir + image_path.split('\\')[-1].split('/')[-1]
|
dest_image_path = dest_dir + image_path.split('\\')[-1].split('/')[-1]
|
||||||
if not Blender.sys.exists(dest_image_path): # Image isnt alredy there
|
if not Blender.sys.exists(dest_image_path): # Image isnt already there
|
||||||
print('\tCopying "%s" > "%s"' % (image_path, dest_image_path))
|
print('\tCopying "%s" > "%s"' % (image_path, dest_image_path))
|
||||||
try:
|
try:
|
||||||
copy_file(image_path, dest_image_path)
|
copy_file(image_path, dest_image_path)
|
||||||
@@ -359,7 +359,7 @@ def write(filename, batch_objects = None, \
|
|||||||
|
|
||||||
if BATCH_OWN_DIR:
|
if BATCH_OWN_DIR:
|
||||||
new_fbxpath = fbxpath + newname + os.sep
|
new_fbxpath = fbxpath + newname + os.sep
|
||||||
# path may alredy exist
|
# path may already exist
|
||||||
# TODO - might exist but be a file. unlikely but should probably account for it.
|
# TODO - might exist but be a file. unlikely but should probably account for it.
|
||||||
|
|
||||||
if bpy.utils.exists(new_fbxpath) == 0:
|
if bpy.utils.exists(new_fbxpath) == 0:
|
||||||
@@ -391,7 +391,7 @@ def write(filename, batch_objects = None, \
|
|||||||
|
|
||||||
|
|
||||||
# Call self with modified args
|
# Call self with modified args
|
||||||
# Dont pass batch options since we alredy usedt them
|
# Dont pass batch options since we already usedt them
|
||||||
write(filename, data.objects,
|
write(filename, data.objects,
|
||||||
context,
|
context,
|
||||||
False,
|
False,
|
||||||
@@ -2763,7 +2763,7 @@ Takes: {''')
|
|||||||
act_end = end
|
act_end = end
|
||||||
else:
|
else:
|
||||||
# use existing name
|
# use existing name
|
||||||
if blenAction == blenActionDefault: # have we alredy got the name
|
if blenAction == blenActionDefault: # have we already got the name
|
||||||
file.write('\n\tTake: "%s" {' % sane_name_mapping_take[blenAction.name])
|
file.write('\n\tTake: "%s" {' % sane_name_mapping_take[blenAction.name])
|
||||||
else:
|
else:
|
||||||
file.write('\n\tTake: "%s" {' % sane_takename(blenAction))
|
file.write('\n\tTake: "%s" {' % sane_takename(blenAction))
|
||||||
@@ -2918,7 +2918,7 @@ Takes: {''')
|
|||||||
for val, frame in context_bone_anim_keys:
|
for val, frame in context_bone_anim_keys:
|
||||||
if frame != context_bone_anim_keys[0][1]: # not the first
|
if frame != context_bone_anim_keys[0][1]: # not the first
|
||||||
file.write(',')
|
file.write(',')
|
||||||
# frame is alredy one less then blenders frame
|
# frame is already one less then blenders frame
|
||||||
file.write('\n\t\t\t\t\t\t\t%i,%.15f,L' % (fbx_time(frame), val ))
|
file.write('\n\t\t\t\t\t\t\t%i,%.15f,L' % (fbx_time(frame), val ))
|
||||||
|
|
||||||
if i==0: file.write('\n\t\t\t\t\t\tColor: 1,0,0')
|
if i==0: file.write('\n\t\t\t\t\t\tColor: 1,0,0')
|
||||||
|
@@ -193,7 +193,7 @@ def copy_images(dest_dir):
|
|||||||
# if bpy.sys.exists(image_path):
|
# if bpy.sys.exists(image_path):
|
||||||
# # Make a name for the target path.
|
# # Make a name for the target path.
|
||||||
# dest_image_path = dest_dir + image_path.split('\\')[-1].split('/')[-1]
|
# dest_image_path = dest_dir + image_path.split('\\')[-1].split('/')[-1]
|
||||||
# if not bpy.utils.exists(dest_image_path): # Image isnt alredy there
|
# if not bpy.utils.exists(dest_image_path): # Image isnt already there
|
||||||
# print('\tCopying "%s" > "%s"' % (image_path, dest_image_path))
|
# print('\tCopying "%s" > "%s"' % (image_path, dest_image_path))
|
||||||
# copy_file(image_path, dest_image_path)
|
# copy_file(image_path, dest_image_path)
|
||||||
# copyCount+=1
|
# copyCount+=1
|
||||||
@@ -299,7 +299,7 @@ def write(filepath, objects, scene,
|
|||||||
EXPORT_POLYGROUPS=False,
|
EXPORT_POLYGROUPS=False,
|
||||||
EXPORT_CURVE_AS_NURBS=True):
|
EXPORT_CURVE_AS_NURBS=True):
|
||||||
'''
|
'''
|
||||||
Basic write function. The context and options must be alredy set
|
Basic write function. The context and options must be already set
|
||||||
This can be accessed externaly
|
This can be accessed externaly
|
||||||
eg.
|
eg.
|
||||||
write( 'c:\\test\\foobar.obj', Blender.Object.GetSelected() ) # Using default options.
|
write( 'c:\\test\\foobar.obj', Blender.Object.GetSelected() ) # Using default options.
|
||||||
@@ -681,7 +681,7 @@ def write(filepath, objects, scene,
|
|||||||
|
|
||||||
# CHECK FOR CONTEXT SWITCH
|
# CHECK FOR CONTEXT SWITCH
|
||||||
if key == contextMat:
|
if key == contextMat:
|
||||||
pass # Context alredy switched, dont do anything
|
pass # Context already switched, dont do anything
|
||||||
else:
|
else:
|
||||||
if key[0] == None and key[1] == None:
|
if key[0] == None and key[1] == None:
|
||||||
# Write a null material, since we know the context has changed.
|
# Write a null material, since we know the context has changed.
|
||||||
|
@@ -60,7 +60,7 @@ def modules_from_path(path, loaded_modules):
|
|||||||
|
|
||||||
:arg path: this path is scanned for scripts and packages.
|
:arg path: this path is scanned for scripts and packages.
|
||||||
:type path: string
|
:type path: string
|
||||||
:arg loaded_modules: alredy loaded module names, files matching these names will be ignored.
|
:arg loaded_modules: already loaded module names, files matching these names will be ignored.
|
||||||
:type loaded_modules: set
|
:type loaded_modules: set
|
||||||
:return: all loaded modules.
|
:return: all loaded modules.
|
||||||
:rtype: list
|
:rtype: list
|
||||||
|
@@ -524,7 +524,7 @@ def mergeUvIslands(islandList):
|
|||||||
then move us 1 whole width accross,
|
then move us 1 whole width accross,
|
||||||
Its possible this is a bad idea since 2 skinny Angular faces
|
Its possible this is a bad idea since 2 skinny Angular faces
|
||||||
could join without 1 whole move, but its a lot more optimal to speed this up
|
could join without 1 whole move, but its a lot more optimal to speed this up
|
||||||
since we have alredy tested for it.
|
since we have already tested for it.
|
||||||
|
|
||||||
It gives about 10% speedup with minimal errors.
|
It gives about 10% speedup with minimal errors.
|
||||||
'''
|
'''
|
||||||
@@ -1027,7 +1027,7 @@ def main(context, island_margin, projection_limit):
|
|||||||
bestAng = fvec.dot(projectVecs[0])
|
bestAng = fvec.dot(projectVecs[0])
|
||||||
bestAngIdx = 0
|
bestAngIdx = 0
|
||||||
|
|
||||||
# Cycle through the remaining, first alredy done
|
# Cycle through the remaining, first already done
|
||||||
while i-1:
|
while i-1:
|
||||||
i-=1
|
i-=1
|
||||||
|
|
||||||
|
@@ -1111,7 +1111,7 @@ class WM_OT_addon_expand(bpy.types.Operator):
|
|||||||
def execute(self, context):
|
def execute(self, context):
|
||||||
module_name = self.properties.module
|
module_name = self.properties.module
|
||||||
|
|
||||||
# unlikely to fail, module should have alredy been imported
|
# unlikely to fail, module should have already been imported
|
||||||
try:
|
try:
|
||||||
mod = __import__(module_name)
|
mod = __import__(module_name)
|
||||||
except:
|
except:
|
||||||
|
@@ -1308,7 +1308,7 @@ void all_local(Library *lib, int untagged_only)
|
|||||||
|
|
||||||
/* The check on the second line (LIB_PRE_EXISTING) is done so its
|
/* The check on the second line (LIB_PRE_EXISTING) is done so its
|
||||||
* possible to tag data you dont want to be made local, used for
|
* possible to tag data you dont want to be made local, used for
|
||||||
* appending data, so any libdata alredy linked wont become local
|
* appending data, so any libdata already linked wont become local
|
||||||
* (very nasty to discover all your links are lost after appending)
|
* (very nasty to discover all your links are lost after appending)
|
||||||
* */
|
* */
|
||||||
if(id->flag & (LIB_EXTERN|LIB_INDIRECT|LIB_NEW) &&
|
if(id->flag & (LIB_EXTERN|LIB_INDIRECT|LIB_NEW) &&
|
||||||
|
@@ -80,7 +80,7 @@ char *BLI_last_slash(const char *string) {
|
|||||||
else return lfslash;
|
else return lfslash;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* adds a slash if there isnt one there alredy */
|
/* adds a slash if there isnt one there already */
|
||||||
int BLI_add_slash(char *string) {
|
int BLI_add_slash(char *string) {
|
||||||
int len = strlen(string);
|
int len = strlen(string);
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
|
@@ -11338,7 +11338,7 @@ static void expand_doit(FileData *fd, Main *mainvar, void *old)
|
|||||||
else {
|
else {
|
||||||
/* The line below was commented by Ton (I assume), when Hos did the merge from the orange branch. rev 6568
|
/* The line below was commented by Ton (I assume), when Hos did the merge from the orange branch. rev 6568
|
||||||
* This line is NEEDED, the case is that you have 3 blend files...
|
* This line is NEEDED, the case is that you have 3 blend files...
|
||||||
* user.blend, lib.blend and lib_indirect.blend - if user.blend alredy references a "tree" from
|
* user.blend, lib.blend and lib_indirect.blend - if user.blend already references a "tree" from
|
||||||
* lib_indirect.blend but lib.blend does too, linking in a Scene or Group from lib.blend can result in an
|
* lib_indirect.blend but lib.blend does too, linking in a Scene or Group from lib.blend can result in an
|
||||||
* empty without the dupli group referenced. Once you save and reload the group would appier. - Campbell */
|
* empty without the dupli group referenced. Once you save and reload the group would appier. - Campbell */
|
||||||
/* This crashes files, must look further into it */
|
/* This crashes files, must look further into it */
|
||||||
@@ -12122,7 +12122,7 @@ static void give_base_to_objects(Main *mainvar, Scene *sce, Library *lib, int is
|
|||||||
|
|
||||||
/* IF below is quite confusing!
|
/* IF below is quite confusing!
|
||||||
if we are appending, but this object wasnt just added allong with a group,
|
if we are appending, but this object wasnt just added allong with a group,
|
||||||
then this is alredy used indirectly in the scene somewhere else and we didnt just append it.
|
then this is already used indirectly in the scene somewhere else and we didnt just append it.
|
||||||
|
|
||||||
(ob->id.flag & LIB_PRE_EXISTING)==0 means that this is a newly appended object - Campbell */
|
(ob->id.flag & LIB_PRE_EXISTING)==0 means that this is a newly appended object - Campbell */
|
||||||
if (is_group_append==0 || (ob->id.flag & LIB_PRE_EXISTING)==0) {
|
if (is_group_append==0 || (ob->id.flag & LIB_PRE_EXISTING)==0) {
|
||||||
|
@@ -931,7 +931,7 @@ static int similar_edge_select__internal(ToolSettings *ts, EditMesh *em, int mod
|
|||||||
/* cound how many faces each edge uses use tmp.l */
|
/* cound how many faces each edge uses use tmp.l */
|
||||||
for(efa= em->faces.first; efa; efa= efa->next) {
|
for(efa= em->faces.first; efa; efa= efa->next) {
|
||||||
/* here we use the edges temp data to assign a face
|
/* here we use the edges temp data to assign a face
|
||||||
if a face has alredy been assigned (eed->f2==1)
|
if a face has already been assigned (eed->f2==1)
|
||||||
we calculate the angle between the current face and
|
we calculate the angle between the current face and
|
||||||
the edges previously found face.
|
the edges previously found face.
|
||||||
store the angle in eed->tmp.fp (loosing the face eed->tmp.f)
|
store the angle in eed->tmp.fp (loosing the face eed->tmp.f)
|
||||||
@@ -1207,7 +1207,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op)
|
|||||||
|
|
||||||
if (dvert && !(eve->f & SELECT) && !eve->h && dvert->totweight) {
|
if (dvert && !(eve->f & SELECT) && !eve->h && dvert->totweight) {
|
||||||
/* do the extra check for selection in the following if, so were not
|
/* do the extra check for selection in the following if, so were not
|
||||||
checking verts that may be alredy selected */
|
checking verts that may be already selected */
|
||||||
for (i=0; base_dvert->totweight >i && !(eve->f & SELECT); i++) {
|
for (i=0; base_dvert->totweight >i && !(eve->f & SELECT); i++) {
|
||||||
for (j=0; dvert->totweight >j; j++) {
|
for (j=0; dvert->totweight >j; j++) {
|
||||||
if (base_dvert->dw[i].def_nr==dvert->dw[j].def_nr) {
|
if (base_dvert->dw[i].def_nr==dvert->dw[j].def_nr) {
|
||||||
|
@@ -1444,7 +1444,7 @@ static ProjPixel *project_paint_uvpixel_init(
|
|||||||
sub_v2_v2v2(co, projPixel->projCoSS, (float *)ps->cloneOffset);
|
sub_v2_v2v2(co, projPixel->projCoSS, (float *)ps->cloneOffset);
|
||||||
|
|
||||||
/* no need to initialize the bucket, we're only checking buckets faces and for this
|
/* no need to initialize the bucket, we're only checking buckets faces and for this
|
||||||
* the faces are alredy initialized in project_paint_delayed_face_init(...) */
|
* the faces are already initialized in project_paint_delayed_face_init(...) */
|
||||||
if (ibuf->rect_float) {
|
if (ibuf->rect_float) {
|
||||||
if (!project_paint_PickColor(ps, co, ((ProjPixelClone *)projPixel)->clonepx.f, NULL, 1)) {
|
if (!project_paint_PickColor(ps, co, ((ProjPixelClone *)projPixel)->clonepx.f, NULL, 1)) {
|
||||||
((ProjPixelClone *)projPixel)->clonepx.f[3] = 0; /* zero alpha - ignore */
|
((ProjPixelClone *)projPixel)->clonepx.f[3] = 0; /* zero alpha - ignore */
|
||||||
@@ -1694,7 +1694,7 @@ static float Vec2Lenf_nosqrt_other(const float *v1, const float v2_1, const floa
|
|||||||
static int project_bucket_isect_circle(const int bucket_x, const int bucket_y, const float cent[2], const float radius_squared, rctf *bucket_bounds)
|
static int project_bucket_isect_circle(const int bucket_x, const int bucket_y, const float cent[2], const float radius_squared, rctf *bucket_bounds)
|
||||||
{
|
{
|
||||||
|
|
||||||
/* Would normally to a simple intersection test, however we know the bounds of these 2 alredy intersect
|
/* Would normally to a simple intersection test, however we know the bounds of these 2 already intersect
|
||||||
* so we only need to test if the center is inside the vertical or horizontal bounds on either axis,
|
* so we only need to test if the center is inside the vertical or horizontal bounds on either axis,
|
||||||
* this is even less work then an intersection test
|
* this is even less work then an intersection test
|
||||||
*
|
*
|
||||||
|
@@ -592,7 +592,7 @@ static void draw_shadedstrip(Sequence *seq, char *col, float x1, float y1, float
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Draw a sequence strip, bounds check alredy made
|
Draw a sequence strip, bounds check already made
|
||||||
ARegion is currently only used to get the windows width in pixels
|
ARegion is currently only used to get the windows width in pixels
|
||||||
so wave file sample drawing precision is zoom adjusted
|
so wave file sample drawing precision is zoom adjusted
|
||||||
*/
|
*/
|
||||||
|
@@ -3835,7 +3835,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
|
|||||||
sprintf(val_pos, (val_pos==val) ? "%.2f" : ":%.2f", pa_health);
|
sprintf(val_pos, (val_pos==val) ? "%.2f" : ":%.2f", pa_health);
|
||||||
|
|
||||||
/* in path drawing state.co is the end point */
|
/* in path drawing state.co is the end point */
|
||||||
/* use worldspace beause object matrix is alredy applied */
|
/* use worldspace beause object matrix is already applied */
|
||||||
mul_v3_m4v3(vec_txt, ob->imat, state.co);
|
mul_v3_m4v3(vec_txt, ob->imat, state.co);
|
||||||
view3d_cached_text_draw_add(vec_txt[0], vec_txt[1], vec_txt[2], val, 10, V3D_CACHE_TEXT_WORLDSPACE);
|
view3d_cached_text_draw_add(vec_txt[0], vec_txt[1], vec_txt[2], val, 10, V3D_CACHE_TEXT_WORLDSPACE);
|
||||||
}
|
}
|
||||||
@@ -3929,7 +3929,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
|
|||||||
val[0]= '\0';
|
val[0]= '\0';
|
||||||
|
|
||||||
sprintf(val, "%i", a);
|
sprintf(val, "%i", a);
|
||||||
/* use worldspace beause object matrix is alredy applied */
|
/* use worldspace beause object matrix is already applied */
|
||||||
mul_v3_m4v3(vec_txt, ob->imat, cache[a]->co);
|
mul_v3_m4v3(vec_txt, ob->imat, cache[a]->co);
|
||||||
view3d_cached_text_draw_add(vec_txt[0], vec_txt[1], vec_txt[2], val, 10, V3D_CACHE_TEXT_WORLDSPACE);
|
view3d_cached_text_draw_add(vec_txt[0], vec_txt[1], vec_txt[2], val, 10, V3D_CACHE_TEXT_WORLDSPACE);
|
||||||
}
|
}
|
||||||
|
@@ -2222,7 +2222,7 @@ static void flyEvent(FlyInfo *fly, wmEvent *event)
|
|||||||
/* impliment WASD keys */
|
/* impliment WASD keys */
|
||||||
case FLY_MODAL_DIR_FORWARD:
|
case FLY_MODAL_DIR_FORWARD:
|
||||||
if (fly->speed < 0.0f) fly->speed= -fly->speed; /* flip speed rather then stopping, game like motion */
|
if (fly->speed < 0.0f) fly->speed= -fly->speed; /* flip speed rather then stopping, game like motion */
|
||||||
else fly->speed += fly->grid; /* increse like mousewheel if were alredy moving in that difection*/
|
else fly->speed += fly->grid; /* increse like mousewheel if were already moving in that difection*/
|
||||||
fly->axis= 2;
|
fly->axis= 2;
|
||||||
break;
|
break;
|
||||||
case FLY_MODAL_DIR_BACKWARD:
|
case FLY_MODAL_DIR_BACKWARD:
|
||||||
|
@@ -2283,7 +2283,7 @@ void flushTransNodes(TransInfo *t)
|
|||||||
#define XXX_DURIAN_ANIM_TX_HACK
|
#define XXX_DURIAN_ANIM_TX_HACK
|
||||||
void flushTransSeq(TransInfo *t)
|
void flushTransSeq(TransInfo *t)
|
||||||
{
|
{
|
||||||
ListBase *seqbasep= seq_give_editing(t->scene, FALSE)->seqbasep; /* Editing null check alredy done */
|
ListBase *seqbasep= seq_give_editing(t->scene, FALSE)->seqbasep; /* Editing null check already done */
|
||||||
int a, new_frame;
|
int a, new_frame;
|
||||||
TransData *td= NULL;
|
TransData *td= NULL;
|
||||||
TransData2D *td2d= NULL;
|
TransData2D *td2d= NULL;
|
||||||
|
@@ -129,7 +129,7 @@ void bicubic_interpolation_color(struct ImBuf *in, unsigned char *outI, float *o
|
|||||||
unsigned char *dataI;
|
unsigned char *dataI;
|
||||||
float a,b,w,wx,wy[4], outR,outG,outB,outA,*dataF;
|
float a,b,w,wx,wy[4], outR,outG,outB,outA,*dataF;
|
||||||
|
|
||||||
/* ImBuf in must have a valid rect or rect_float, assume this is alredy checked */
|
/* ImBuf in must have a valid rect or rect_float, assume this is already checked */
|
||||||
|
|
||||||
i= (int)floor(u);
|
i= (int)floor(u);
|
||||||
j= (int)floor(v);
|
j= (int)floor(v);
|
||||||
@@ -245,7 +245,7 @@ void bilinear_interpolation_color(struct ImBuf *in, unsigned char *outI, float *
|
|||||||
int y1, y2, x1, x2;
|
int y1, y2, x1, x2;
|
||||||
|
|
||||||
|
|
||||||
/* ImBuf in must have a valid rect or rect_float, assume this is alredy checked */
|
/* ImBuf in must have a valid rect or rect_float, assume this is already checked */
|
||||||
|
|
||||||
x1= (int)floor(u);
|
x1= (int)floor(u);
|
||||||
x2= (int)ceil(u);
|
x2= (int)ceil(u);
|
||||||
@@ -319,7 +319,7 @@ void bilinear_interpolation_color_wrap(struct ImBuf *in, unsigned char *outI, fl
|
|||||||
int y1, y2, x1, x2;
|
int y1, y2, x1, x2;
|
||||||
|
|
||||||
|
|
||||||
/* ImBuf in must have a valid rect or rect_float, assume this is alredy checked */
|
/* ImBuf in must have a valid rect or rect_float, assume this is already checked */
|
||||||
|
|
||||||
x1= (int)floor(u);
|
x1= (int)floor(u);
|
||||||
x2= (int)ceil(u);
|
x2= (int)ceil(u);
|
||||||
@@ -393,7 +393,7 @@ void neareast_interpolation_color(struct ImBuf *in, unsigned char *outI, float *
|
|||||||
unsigned char *dataI;
|
unsigned char *dataI;
|
||||||
int y1, x1;
|
int y1, x1;
|
||||||
|
|
||||||
/* ImBuf in must have a valid rect or rect_float, assume this is alredy checked */
|
/* ImBuf in must have a valid rect or rect_float, assume this is already checked */
|
||||||
|
|
||||||
x1= (int)(u);
|
x1= (int)(u);
|
||||||
y1= (int)(v);
|
y1= (int)(v);
|
||||||
|
@@ -41,9 +41,9 @@
|
|||||||
#include "DNA_sdna_types.h" // for SDNA ;-)
|
#include "DNA_sdna_types.h" // for SDNA ;-)
|
||||||
|
|
||||||
|
|
||||||
/* gcc 4.1 on mingw was complaining that __int64 was alredy defined
|
/* gcc 4.1 on mingw was complaining that __int64 was already defined
|
||||||
actually is saw the line below as typedef long long long long...
|
actually is saw the line below as typedef long long long long...
|
||||||
Anyhow, since its alredy defined, its safe to do an ifndef here- Cambpell*/
|
Anyhow, since its already defined, its safe to do an ifndef here- Cambpell*/
|
||||||
#ifdef FREE_WINDOWS
|
#ifdef FREE_WINDOWS
|
||||||
#ifndef __int64
|
#ifndef __int64
|
||||||
typedef long long __int64;
|
typedef long long __int64;
|
||||||
|
@@ -100,7 +100,7 @@ static FCurve *rna_Action_fcurve_new(bAction *act, ReportList *reports, char *da
|
|||||||
|
|
||||||
/* annoying, check if this exists */
|
/* annoying, check if this exists */
|
||||||
if(verify_fcurve(act, group, data_path, index, 0)) {
|
if(verify_fcurve(act, group, data_path, index, 0)) {
|
||||||
BKE_reportf(reports, RPT_ERROR, "FCurve '%s[%d]' alredy exists in action '%s'", data_path, index, act->id.name+2);
|
BKE_reportf(reports, RPT_ERROR, "FCurve '%s[%d]' already exists in action '%s'", data_path, index, act->id.name+2);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
return verify_fcurve(act, group, data_path, index, 1);
|
return verify_fcurve(act, group, data_path, index, 1);
|
||||||
|
@@ -238,7 +238,7 @@ def write_files(basename, props_list, props_length_max):
|
|||||||
# rna_api
|
# rna_api
|
||||||
if props[0] == 'NOTE': indent = '# '
|
if props[0] == 'NOTE': indent = '# '
|
||||||
else: indent = ' '
|
else: indent = ' '
|
||||||
rna += indent + '("%s", "%s", "%s", "%s", %s),\n' % tuple(props[2:5] + props[6:]) # description is alredy string formatted
|
rna += indent + '("%s", "%s", "%s", "%s", %s),\n' % tuple(props[2:5] + props[6:]) # description is already string formatted
|
||||||
# py
|
# py
|
||||||
blanks = [' '* (x[0]-x[1]) for x in zip(props_length_max,list(map(len,props)))]
|
blanks = [' '* (x[0]-x[1]) for x in zip(props_length_max,list(map(len,props)))]
|
||||||
props = [('"%s"%s' if props[-1] != x[0] else "%s%s") % (x[0],x[1]) for x in zip(props,blanks)]
|
props = [('"%s"%s' if props[-1] != x[0] else "%s%s") % (x[0],x[1]) for x in zip(props,blanks)]
|
||||||
|
@@ -767,7 +767,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
|
|||||||
mface_index++;
|
mface_index++;
|
||||||
|
|
||||||
/* new vertical edge */
|
/* new vertical edge */
|
||||||
if (j) { /* The first set is alredy dome */
|
if (j) { /* The first set is already dome */
|
||||||
med_new->v1= i1;
|
med_new->v1= i1;
|
||||||
med_new->v2= i2;
|
med_new->v2= i2;
|
||||||
med_new->flag= med_new_firstloop->flag;
|
med_new->flag= med_new_firstloop->flag;
|
||||||
|
@@ -200,7 +200,7 @@ static PyObject *blender_import( PyObject * self, PyObject * args, PyObject * k
|
|||||||
&name, &globals, &locals, &fromlist, &dummy_val) )
|
&name, &globals, &locals, &fromlist, &dummy_val) )
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
/* import existing builtin modules or modules that have been imported alredy */
|
/* import existing builtin modules or modules that have been imported already */
|
||||||
newmodule = PyImport_ImportModuleEx( name, globals, locals, fromlist );
|
newmodule = PyImport_ImportModuleEx( name, globals, locals, fromlist );
|
||||||
|
|
||||||
if(newmodule)
|
if(newmodule)
|
||||||
|
@@ -634,7 +634,7 @@ static int boxPack_FromPyObject(PyObject * value, boxPack **boxarray )
|
|||||||
boxPack *box;
|
boxPack *box;
|
||||||
|
|
||||||
|
|
||||||
/* Error checking must alredy be done */
|
/* Error checking must already be done */
|
||||||
if( !PyList_Check( value ) ) {
|
if( !PyList_Check( value ) ) {
|
||||||
PyErr_SetString( PyExc_TypeError, "can only back a list of [x,y,x,w]" );
|
PyErr_SetString( PyExc_TypeError, "can only back a list of [x,y,x,w]" );
|
||||||
return -1;
|
return -1;
|
||||||
|
@@ -634,7 +634,7 @@ int Mathutils_RegisterCallback(Mathutils_Callback *cb)
|
|||||||
|
|
||||||
/* find the first free slot */
|
/* find the first free slot */
|
||||||
for(i= 0; mathutils_callbacks[i]; i++) {
|
for(i= 0; mathutils_callbacks[i]; i++) {
|
||||||
if(mathutils_callbacks[i]==cb) /* alredy registered? */
|
if(mathutils_callbacks[i]==cb) /* already registered? */
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1468,7 +1468,7 @@ static int Vector_setLength(VectorObject *self, PyObject * value )
|
|||||||
self->vec[i]= self->vec[i] / (float)dot;
|
self->vec[i]= self->vec[i] / (float)dot;
|
||||||
}
|
}
|
||||||
|
|
||||||
BaseMath_WriteCallback(self); /* checked alredy */
|
BaseMath_WriteCallback(self); /* checked already */
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -2034,7 +2034,7 @@ static PyObject *Vector_Negate(VectorObject *self)
|
|||||||
for(i = 0; i < self->size; i++)
|
for(i = 0; i < self->size; i++)
|
||||||
self->vec[i] = -(self->vec[i]);
|
self->vec[i] = -(self->vec[i]);
|
||||||
|
|
||||||
BaseMath_WriteCallback(self); // alredy checked for error
|
BaseMath_WriteCallback(self); // already checked for error
|
||||||
|
|
||||||
Py_INCREF(self);
|
Py_INCREF(self);
|
||||||
return (PyObject*)self;
|
return (PyObject*)self;
|
||||||
|
@@ -3970,7 +3970,7 @@ static PyObject* pyrna_srna_Subtype(StructRNA *srna)
|
|||||||
- myClass = type(name='myClass', bases=(myBase,), dict={'__module__':'bpy.types'})
|
- myClass = type(name='myClass', bases=(myBase,), dict={'__module__':'bpy.types'})
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Assume RNA_struct_py_type_get(srna) was alredy checked */
|
/* Assume RNA_struct_py_type_get(srna) was already checked */
|
||||||
PyObject *py_base= pyrna_srna_PyBase(srna);
|
PyObject *py_base= pyrna_srna_PyBase(srna);
|
||||||
|
|
||||||
const char *idname= RNA_struct_identifier(srna);
|
const char *idname= RNA_struct_identifier(srna);
|
||||||
|
@@ -801,7 +801,7 @@ int WM_operator_name_call(bContext *C, const char *opstring, int context, Pointe
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Similar to WM_operator_name_call called with WM_OP_EXEC_DEFAULT context.
|
/* Similar to WM_operator_name_call called with WM_OP_EXEC_DEFAULT context.
|
||||||
- wmOperatorType is used instead of operator name since python alredy has the operator type
|
- wmOperatorType is used instead of operator name since python already has the operator type
|
||||||
- poll() must be called by python before this runs.
|
- poll() must be called by python before this runs.
|
||||||
- reports can be passed to this function (so python can report them as exceptions)
|
- reports can be passed to this function (so python can report them as exceptions)
|
||||||
*/
|
*/
|
||||||
|
@@ -166,7 +166,7 @@ PyObject * PyObjectPlus::py_base_new(PyTypeObject *type, PyObject *args, PyObjec
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* use base_type rather then Py_TYPE(base) because we could alredy be subtyped */
|
/* use base_type rather then Py_TYPE(base) because we could already be subtyped */
|
||||||
if(!PyType_IsSubtype(type, base_type)) {
|
if(!PyType_IsSubtype(type, base_type)) {
|
||||||
PyErr_Format(PyExc_TypeError, "can't subclass blender game type <%s> from <%s> because it is not a subclass", base_type->tp_name, type->tp_name);
|
PyErr_Format(PyExc_TypeError, "can't subclass blender game type <%s> from <%s> because it is not a subclass", base_type->tp_name, type->tp_name);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@@ -264,7 +264,7 @@ void SCA_PythonController::ErrorPrint(const char *error_msg)
|
|||||||
/* Added in 2.48a, the last_traceback can reference Objects for example, increasing
|
/* Added in 2.48a, the last_traceback can reference Objects for example, increasing
|
||||||
* their user count. Not to mention holding references to wrapped data.
|
* their user count. Not to mention holding references to wrapped data.
|
||||||
* This is especially bad when the PyObject for the wrapped data is free'd, after blender
|
* This is especially bad when the PyObject for the wrapped data is free'd, after blender
|
||||||
* has alredy dealocated the pointer */
|
* has already dealocated the pointer */
|
||||||
PySys_SetObject( (char *)"last_traceback", NULL);
|
PySys_SetObject( (char *)"last_traceback", NULL);
|
||||||
PyErr_Clear(); /* just to be sure */
|
PyErr_Clear(); /* just to be sure */
|
||||||
}
|
}
|
||||||
@@ -452,7 +452,7 @@ void SCA_PythonController::Trigger(SCA_LogicManager* logicmgr)
|
|||||||
/* Added in 2.48a, the last_traceback can reference Objects for example, increasing
|
/* Added in 2.48a, the last_traceback can reference Objects for example, increasing
|
||||||
* their user count. Not to mention holding references to wrapped data.
|
* their user count. Not to mention holding references to wrapped data.
|
||||||
* This is especially bad when the PyObject for the wrapped data is free'd, after blender
|
* This is especially bad when the PyObject for the wrapped data is free'd, after blender
|
||||||
* has alredy dealocated the pointer */
|
* has already dealocated the pointer */
|
||||||
PySys_SetObject( (char *)"last_traceback", NULL);
|
PySys_SetObject( (char *)"last_traceback", NULL);
|
||||||
PyErr_Clear(); /* just to be sure */
|
PyErr_Clear(); /* just to be sure */
|
||||||
}
|
}
|
||||||
|
@@ -351,7 +351,7 @@ static PyObject *KX_PythonSeq_getIter(KX_PythonSeq *self)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* create a new iterator if were alredy using this one */
|
/* create a new iterator if were already using this one */
|
||||||
if (self->iter == -1) {
|
if (self->iter == -1) {
|
||||||
self->iter = 0;
|
self->iter = 0;
|
||||||
Py_INCREF(self);
|
Py_INCREF(self);
|
||||||
|
@@ -507,7 +507,7 @@ bool CcdPhysicsController::DeleteControllerShape( )
|
|||||||
bool CcdPhysicsController::ReplaceControllerShape(btCollisionShape *newShape)
|
bool CcdPhysicsController::ReplaceControllerShape(btCollisionShape *newShape)
|
||||||
{
|
{
|
||||||
|
|
||||||
/* Note, deleting the previous collision shape must be done alredy */
|
/* Note, deleting the previous collision shape must be done already */
|
||||||
/* if (m_collisionShape) DeleteControllerShape(); */
|
/* if (m_collisionShape) DeleteControllerShape(); */
|
||||||
|
|
||||||
m_object->setCollisionShape(newShape);
|
m_object->setCollisionShape(newShape);
|
||||||
|
Reference in New Issue
Block a user