Revision: 27828
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27828
Author: campbellbarton
Date: 2010-03-29 11:07:03 +0200 (Mon, 29 Mar 2010)
Log Message:
-----------
spelling: wich --> which
Modified Paths:
--------------
branches/render25/release/plugins/sequence/blur.c
branches/render25/source/blender/blenkernel/BKE_library.h
branches/render25/source/blender/blenkernel/intern/library.c
branches/render25/source/blender/blenkernel/intern/modifier.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/editors/interface/interface.c
branches/render25/source/blender/editors/interface/interface_templates.c
branches/render25/source/blender/editors/space_file/filelist.c
branches/render25/source/blender/render/intern/raytrace/rayobject.cpp
Modified: branches/render25/release/plugins/sequence/blur.c
===================================================================
--- branches/render25/release/plugins/sequence/blur.c 2010-03-29 08:33:35 UTC
(rev 27827)
+++ branches/render25/release/plugins/sequence/blur.c 2010-03-29 09:07:03 UTC
(rev 27828)
@@ -160,7 +160,7 @@
char *irect, *prect, *mrect;
float *irectf, *prectf, *mrectf;
- /* wich buffers ? */
+ /* which buffers ? */
if(fac>7.0) fac= 7.0;
if(fac<=1.0) return;
Modified: branches/render25/source/blender/blenkernel/BKE_library.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_library.h 2010-03-29
08:33:35 UTC (rev 27827)
+++ branches/render25/source/blender/blenkernel/BKE_library.h 2010-03-29
09:07:03 UTC (rev 27828)
@@ -53,7 +53,7 @@
int new_id(struct ListBase *lb, struct ID *id, const char *name);
-struct ListBase *wich_libbase(struct Main *mainlib, short type);
+struct ListBase *which_libbase(struct Main *mainlib, short type);
#define MAX_LIBARRAY 40
int set_listbasepointers(struct Main *main, struct ListBase **lb);
Modified: branches/render25/source/blender/blenkernel/intern/library.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/library.c
2010-03-29 08:33:35 UTC (rev 27827)
+++ branches/render25/source/blender/blenkernel/intern/library.c
2010-03-29 09:07:03 UTC (rev 27828)
@@ -347,7 +347,7 @@
if(id->us == 0) {
if(test) return 1;
- lb= wich_libbase(mainlib, GS(id->name));
+ lb= which_libbase(mainlib, GS(id->name));
free_libblock(lb, id);
return 1;
@@ -356,7 +356,7 @@
return 0;
}
-ListBase *wich_libbase(Main *mainlib, short type)
+ListBase *which_libbase(Main *mainlib, short type)
{
switch( type ) {
case ID_SCE:
@@ -658,7 +658,7 @@
id= rt;
- lb= wich_libbase(G.main, GS(id->name));
+ lb= which_libbase(G.main, GS(id->name));
idn= alloc_libblock(lb, GS(id->name), id->name+2);
if(idn==NULL) {
@@ -867,7 +867,7 @@
ID *find_id(char *type, char *name) /* type: "OB" or "MA" etc */
{
- ListBase *lb= wich_libbase(G.main, GS(type));
+ ListBase *lb= which_libbase(G.main, GS(type));
return BLI_findstring(lb, name, offsetof(ID, name) + 2);
}
@@ -1175,7 +1175,7 @@
if(id->lib) return 0;
/* if no libdata given, look up based on ID */
- if(lb==NULL) lb= wich_libbase(G.main, GS(id->name));
+ if(lb==NULL) lb= which_libbase(G.main, GS(id->name));
/* if no name given, use name of current ID
* else make a copy (tname args can be const) */
@@ -1348,7 +1348,7 @@
ID *idtest;
- lb= wich_libbase(G.main, GS(name-2) );
+ lb= which_libbase(G.main, GS(name-2) );
if(lb==0) return;
/* search for id */
@@ -1383,7 +1383,7 @@
ListBase *lb;
strncpy(id->name+2, name, 21);
- lb= wich_libbase(G.main, GS(id->name) );
+ lb= which_libbase(G.main, GS(id->name) );
new_id(lb, id, name);
}
Modified: branches/render25/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/modifier.c
2010-03-29 08:33:35 UTC (rev 27827)
+++ branches/render25/source/blender/blenkernel/intern/modifier.c
2010-03-29 09:07:03 UTC (rev 27828)
@@ -6506,7 +6506,7 @@
ed_loop_flip= 1;
}
else {
- /* not so
simple to work out wich edge is higher */
+ /* not so
simple to work out which edge is higher */
sub_v3_v3v3(tmp_vec1, tmpf1, vc_tmp->co);
sub_v3_v3v3(tmp_vec1, tmpf2, vc_tmp->co);
normalize_v3(tmp_vec1);
Modified: branches/render25/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/render25/source/blender/blenloader/intern/readfile.c
2010-03-29 08:33:35 UTC (rev 27827)
+++ branches/render25/source/blender/blenloader/intern/readfile.c
2010-03-29 09:07:03 UTC (rev 27828)
@@ -120,7 +120,7 @@
#include "BKE_group.h"
#include "BKE_image.h"
#include "BKE_lattice.h"
-#include "BKE_library.h" // for wich_libbase
+#include "BKE_library.h" // for which_libbase
#include "BKE_main.h" // for Main
#include "BKE_mesh.h" // for ME_ defines (patching)
#include "BKE_modifier.h"
@@ -429,7 +429,7 @@
mainvar= first;
while(mainvar) {
if(mainvar->curlib==id->lib) {
- lbn= wich_libbase(mainvar,
GS(id->name));
+ lbn= which_libbase(mainvar,
GS(id->name));
BLI_remlink(lb, id);
BLI_addtail(lbn, id);
break;
@@ -4677,7 +4677,7 @@
{
if(id) {
- ListBase *lb= wich_libbase(mainp, GS(id->name));
+ ListBase *lb= which_libbase(mainp, GS(id->name));
if(lb) { // there's still risk of checking corrupt mem
(freed Ids in oops)
ID *idn= lb->first;
@@ -5370,10 +5370,10 @@
/* do after read_struct, for dna reconstruct */
if(bhead->code==ID_ID) {
- lb= wich_libbase(main, GS(id->name));
+ lb= which_libbase(main, GS(id->name));
}
else {
- lb= wich_libbase(main, bhead->code);
+ lb= which_libbase(main, bhead->code);
}
BLI_addtail(lb, id);
@@ -10996,8 +10996,8 @@
static ID *is_yet_read(FileData *fd, Main *mainvar, BHead *bhead)
{
const char *idname= bhead_id_name(fd, bhead);
- /* wich_libbase can be NULL, intentionally not using idname+2 */
- return BLI_findstring(wich_libbase(mainvar, GS(idname)), idname,
offsetof(ID, name));
+ /* which_libbase can be NULL, intentionally not using idname+2 */
+ return BLI_findstring(which_libbase(mainvar, GS(idname)), idname,
offsetof(ID, name));
}
static void expand_doit(FileData *fd, Main *mainvar, void *old)
Modified: branches/render25/source/blender/editors/interface/interface.c
===================================================================
--- branches/render25/source/blender/editors/interface/interface.c
2010-03-29 08:33:35 UTC (rev 27827)
+++ branches/render25/source/blender/editors/interface/interface.c
2010-03-29 09:07:03 UTC (rev 27828)
@@ -2693,7 +2693,7 @@
static void autocomplete_id(bContext *C, char *str, void *arg_v)
{
int blocktype= (intptr_t)arg_v;
- ListBase *listb= wich_libbase(CTX_data_main(C), blocktype);
+ ListBase *listb= which_libbase(CTX_data_main(C), blocktype);
if(listb==NULL) return;
Modified:
branches/render25/source/blender/editors/interface/interface_templates.c
===================================================================
--- branches/render25/source/blender/editors/interface/interface_templates.c
2010-03-29 08:33:35 UTC (rev 27827)
+++ branches/render25/source/blender/editors/interface/interface_templates.c
2010-03-29 09:07:03 UTC (rev 27828)
@@ -497,7 +497,7 @@
flag |= UI_ID_OPEN;
type= RNA_property_pointer_type(ptr, prop);
- template->idlb= wich_libbase(CTX_data_main(C),
RNA_type_to_ID_code(type));
+ template->idlb= which_libbase(CTX_data_main(C),
RNA_type_to_ID_code(type));
/* create UI elements for this template
* - template_ID makes a copy of the template data and assigns it
to the relevant buttons
Modified: branches/render25/source/blender/editors/space_file/filelist.c
===================================================================
--- branches/render25/source/blender/editors/space_file/filelist.c
2010-03-29 08:33:35 UTC (rev 27827)
+++ branches/render25/source/blender/editors/space_file/filelist.c
2010-03-29 09:07:03 UTC (rev 27828)
@@ -1176,7 +1176,7 @@
/* make files */
idcode= groupname_to_code(filelist->dir);
- lb= wich_libbase(G.main, idcode );
+ lb= which_libbase(G.main, idcode );
if(lb==0) return;
id= lb->first;
Modified: branches/render25/source/blender/render/intern/raytrace/rayobject.cpp
===================================================================
--- branches/render25/source/blender/render/intern/raytrace/rayobject.cpp
2010-03-29 08:33:35 UTC (rev 27827)
+++ branches/render25/source/blender/render/intern/raytrace/rayobject.cpp
2010-03-29 09:07:03 UTC (rev 27828)
@@ -302,7 +302,7 @@
RE_RC_COUNT(is->raycounter->faces.hit);
- is->isect= ok; // wich half of the quad
+ is->isect= ok; // which half of the quad
is->labda= labda;
is->u= uv[0]; is->v= uv[1];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
