[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36826] trunk/blender/source/blender: fix own mistake [#27451] Flip to Top / Flip to Bottom menuitems on right click on header not working
Campbell Barton
ideasman42 at gmail.com
Mon May 23 10:14:30 CEST 2011
Revision: 36826
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36826
Author: campbellbarton
Date: 2011-05-23 08:14:29 +0000 (Mon, 23 May 2011)
Log Message:
-----------
fix own mistake [#27451] Flip to Top / Flip to Bottom menuitems on right click on header not working
also get rig of more shadowed vars (-Wshadow).
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_text.h
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenlib/intern/edgehash.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_text/text_ops.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_snap.c
Modified: trunk/blender/source/blender/blenkernel/BKE_text.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_text.h 2011-05-23 02:59:29 UTC (rev 36825)
+++ trunk/blender/source/blender/blenkernel/BKE_text.h 2011-05-23 08:14:29 UTC (rev 36826)
@@ -91,12 +91,12 @@
int txt_add_char (struct Text *text, char add);
int txt_add_raw_char (struct Text *text, char add);
int txt_replace_char (struct Text *text, char add);
-void txt_export_to_object (struct Text *text);
+void txt_export_to_object(struct Text *text);
void txt_export_to_objects(struct Text *text);
-void unindent (struct Text *text);
-void comment (struct Text *text);
-void indent (struct Text *text);
-void uncomment (struct Text *text);
+void txt_unindent (struct Text *text);
+void txt_comment (struct Text *text);
+void txt_indent (struct Text *text);
+void txt_uncomment (struct Text *text);
int setcurr_tab_spaces (struct Text *text, int space);
void txt_add_marker (struct Text *text, struct TextLine *line, int start, int end, const unsigned char color[4], int group, int flags);
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2011-05-23 02:59:29 UTC (rev 36825)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2011-05-23 08:14:29 UTC (rev 36826)
@@ -1894,13 +1894,13 @@
if (op==UNDO_INDENT) {
- unindent(text);
+ txt_unindent(text);
} else if (op== UNDO_UNINDENT) {
- indent(text);
+ txt_indent(text);
} else if (op == UNDO_COMMENT) {
- uncomment(text);
+ txt_uncomment(text);
} else if (op == UNDO_UNCOMMENT) {
- comment(text);
+ txt_comment(text);
}
text->undo_pos--;
@@ -2110,13 +2110,13 @@
}
if (op==UNDO_INDENT) {
- indent(text);
+ txt_indent(text);
} else if (op== UNDO_UNINDENT) {
- unindent(text);
+ txt_unindent(text);
} else if (op == UNDO_COMMENT) {
- comment(text);
+ txt_comment(text);
} else if (op == UNDO_UNCOMMENT) {
- uncomment(text);
+ txt_uncomment(text);
}
break;
default:
@@ -2501,7 +2501,7 @@
return 1;
}
-void indent(Text *text)
+void txt_indent(Text *text)
{
int len, num;
char *tmp;
@@ -2564,7 +2564,7 @@
}
}
-void unindent(Text *text)
+void txt_unindent(Text *text)
{
int num = 0;
const char *remove = "\t";
@@ -2622,7 +2622,7 @@
}
}
-void comment(Text *text)
+void txt_comment(Text *text)
{
int len, num;
char *tmp;
@@ -2674,7 +2674,7 @@
}
}
-void uncomment(Text *text)
+void txt_uncomment(Text *text)
{
int num = 0;
char remove = '#';
@@ -2751,19 +2751,19 @@
* 2) within an identifier
* 3) after the cursor (text->curc), i.e. when creating space before a function def [#25414]
*/
- int a, indent = 0;
+ int a, is_indent = 0;
for(a=0; (a < text->curc) && (text->curl->line[a] != '\0'); a++)
{
char ch= text->curl->line[a];
if (ch=='#') {
break;
} else if (ch==':') {
- indent = 1;
+ is_indent = 1;
} else if (ch==']' || ch=='}' || ch=='"' || ch=='\'') {
- indent = 0;
+ is_indent = 0;
}
}
- if (indent) {
+ if (is_indent) {
i += space;
}
}
Modified: trunk/blender/source/blender/blenlib/intern/edgehash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/edgehash.c 2011-05-23 02:59:29 UTC (rev 36825)
+++ trunk/blender/source/blender/blenlib/intern/edgehash.c 2011-05-23 08:14:29 UTC (rev 36826)
@@ -96,7 +96,7 @@
eh->buckets[hash]= e;
if (++eh->nentries>eh->nbuckets*3) {
- Entry *e, **old= eh->buckets;
+ Entry **old= eh->buckets;
int i, nold= eh->nbuckets;
eh->nbuckets= hashsizes[++eh->cursize];
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-05-23 02:59:29 UTC (rev 36825)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-05-23 08:14:29 UTC (rev 36826)
@@ -4138,7 +4138,6 @@
bSensor *sens;
bController *cont;
bActuator *act;
- int a;
/* weak weak... this was only meant as draw flag, now is used in give_base_to_objects too */
ob->flag &= ~OB_FROMGROUP;
@@ -4238,6 +4237,7 @@
sb->keys= newdataadr(fd, sb->keys);
test_pointer_array(fd, (void **)&sb->keys);
if(sb->keys) {
+ int a;
for(a=0; a<sb->totkey; a++) {
sb->keys[a]= newdataadr(fd, sb->keys[a]);
}
@@ -8378,7 +8378,7 @@
ArmatureModifierData *amd = (ArmatureModifierData*) md;
if(amd->object && amd->deformflag==0) {
Object *oba= newlibadr(fd, lib, amd->object);
- bArmature *arm= newlibadr(fd, lib, oba->data);
+ arm= newlibadr(fd, lib, oba->data);
amd->deformflag= arm->deformflag;
}
}
@@ -8525,7 +8525,7 @@
int a;
for(a=0; a<MAX_MTEX; a++) {
if(ma->mtex[a] && ma->mtex[a]->tex) {
- Tex *tex= newlibadr(fd, lib, ma->mtex[a]->tex);
+ tex= newlibadr(fd, lib, ma->mtex[a]->tex);
if(tex && tex->type==TEX_STUCCI)
ma->mtex[a]->mapto &= ~(MAP_COL|MAP_SPEC|MAP_REF);
}
@@ -8717,7 +8717,6 @@
/* now, subversion control! */
if(main->subversionfile < 3) {
- bScreen *sc;
Image *ima;
Tex *tex;
@@ -10133,7 +10132,6 @@
ToolSettings *ts;
//PTCacheID *pid;
//ListBase pidlist;
- int a;
for(ob = main->object.first; ob; ob = ob->id.next) {
//BKE_ptcache_ids_from_object(&pidlist, ob);
@@ -10172,6 +10170,7 @@
}
for(ma = main->mat.first; ma; ma = ma->id.next) {
+ int a;
if(ma->mode & MA_WIRE) {
ma->material_type= MA_TYPE_WIRE;
ma->mode &= ~MA_WIRE;
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2011-05-23 02:59:29 UTC (rev 36825)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2011-05-23 08:14:29 UTC (rev 36826)
@@ -2130,8 +2130,8 @@
writestruct(wd, DATA, "SpaceText", 1, sl);
}
else if(sl->spacetype==SPACE_SCRIPT) {
- SpaceScript *sc = (SpaceScript*)sl;
- sc->but_refs = NULL;
+ SpaceScript *scr = (SpaceScript*)sl;
+ scr->but_refs = NULL;
writestruct(wd, DATA, "SpaceScript", 1, sl);
}
else if(sl->spacetype==SPACE_ACTION) {
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2011-05-23 02:59:29 UTC (rev 36825)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2011-05-23 08:14:29 UTC (rev 36826)
@@ -780,7 +780,7 @@
/* are there keys? */
if(cu->key) {
- int a, i, j;
+ int a, i;
EditNurb *editnurb= cu->editnurb;
KeyBlock *currkey;
KeyBlock *actkey= BLI_findlink(&cu->key->block, editnurb->shapenr-1);
@@ -804,7 +804,6 @@
}
if(act_is_basis) { /* active key is a base */
- int j;
int totvec= 0;
/* Calculate needed memory to store offset */
@@ -831,6 +830,7 @@
oldbezt= getKeyIndexOrig_bezt(editnurb, bezt);
if (oldbezt) {
+ int j;
for (j= 0; j < 3; ++j) {
VECSUB(ofs[i], bezt->vec[j], oldbezt->vec[j]);
i++;
@@ -878,6 +878,7 @@
bezt= nu->bezt;
a= nu->pntsu;
while(a--) {
+ int j;
oldbezt= getKeyIndexOrig_bezt(editnurb, bezt);
for (j= 0; j < 3; ++j, ++i) {
@@ -932,6 +933,7 @@
while(a--) {
index= getKeyIndexOrig_keyIndex(editnurb, bezt);
if (index >= 0) {
+ int j;
curofp= ofp + index;
for (j= 0; j < 3; ++j, ++i) {
@@ -953,6 +955,7 @@
fp+= 3; /* alphas */
} else {
+ int j;
for (j= 0; j < 3; ++j, ++i) {
VECCOPY(fp, bezt->vec[j]);
fp+= 3;
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2011-05-23 02:59:29 UTC (rev 36825)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2011-05-23 08:14:29 UTC (rev 36826)
@@ -2616,7 +2616,7 @@
*/
if((ar == NULL) || (ar->regiontype != RGN_TYPE_HEADER)) {
ScrArea *sa= CTX_wm_area(C);
- ARegion *ar= BKE_area_find_region_type(sa, RGN_TYPE_HEADER);
+ ar= BKE_area_find_region_type(sa, RGN_TYPE_HEADER);
/* don't do anything if no region */
if(ar == NULL)
Modified: trunk/blender/source/blender/editors/space_text/text_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_ops.c 2011-05-23 02:59:29 UTC (rev 36825)
+++ trunk/blender/source/blender/editors/space_text/text_ops.c 2011-05-23 08:14:29 UTC (rev 36826)
@@ -894,7 +894,7 @@
if(txt_has_sel(text)) {
txt_order_cursors(text);
- indent(text);
+ txt_indent(text);
}
else
txt_add_char(text, '\t');
@@ -929,7 +929,7 @@
text_drawcache_tag_update(CTX_wm_space_text(C), 0);
txt_order_cursors(text);
- unindent(text);
+ txt_unindent(text);
text_update_edited(text);
@@ -1011,7 +1011,7 @@
text_drawcache_tag_update(CTX_wm_space_text(C), 0);
txt_order_cursors(text);
- comment(text);
+ txt_comment(text);
text_update_edited(text);
text_update_cursor_moved(C);
@@ -1044,7 +1044,7 @@
text_drawcache_tag_update(CTX_wm_space_text(C), 0);
txt_order_cursors(text);
- uncomment(text);
+ txt_uncomment(text);
text_update_edited(text);
text_update_cursor_moved(C);
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2011-05-23 02:59:29 UTC (rev 36825)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2011-05-23 08:14:29 UTC (rev 36826)
@@ -4937,8 +4937,8 @@
/* when running transform non-interactively (operator exec),
* we need to update the pose otherwise no updates get called during
* transform and the auto-ik is not applied. see [#26164] */
- struct Object *ob=t->poseobj;
- where_is_pose(t->scene, ob);
+ struct Object *pose_ob=t->poseobj;
+ where_is_pose(t->scene, pose_ob);
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list