archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

* Big, mundane clean up and edit of (error/ok/etc)

Browse Source 
messages and pupmenu()s. Edited spelling and grammar,
 stylistic consistency, etc.

I added the guidelines and rationale that I used to the
 CMS here:
http://www.blender3d.org/cms/Language_and_terminology.338.0.html

Next step is to get icons in there, to make it easier to see
 at a glance what sort of message (and how much attention
 should be paid to it, or if it can be dismissed with a flick
 of the mouse, eg. boring remove doubles notifications)

mockup: http://mke3.net:9000/blender/ui/controls/error_ok_icons.png
This commit is contained in:
Matt Ebb
2004-06-05 05:55:15 +00:00
parent 4b544c75c0
commit 506b78bfbb
27 changed files with 203 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/src/editface.c
View File

@@ -778,7 +778,7 @@ void rotate_uv_tface()
me= get_mesh(OBACT);
if(me==0 || me->tface==0) return;
mode= pupmenu("OK? %t|Rot UV %x1|Rot VertexCol %x2");
mode= pupmenu("Rotate %t|UV Co-ordinates %x1|Vertex Colors %x2");
if(mode<1) return;
@@ -893,7 +893,7 @@ void face_select()
/* Get the face under the cursor */
ob = OBACT;
if (!(ob->lay & G.vd->lay)) {
error("Active object not in this layer!");
error("The active object is not in this layer");
}
me = get_mesh(ob);
getmouseco_areawin(mval);
@@ -1394,16 +1394,16 @@ void face_draw()
error("No active object"); return;
}
if (!(ob->lay & G.vd->lay)) {
error("Active object not in this layer"); return;
error("The active object is not in this layer"); return;
}
me = get_mesh(ob);
if (!me) {
error("Active object does not have a mesh"); return;
error("The active object does not have a mesh obData"); return;
}
brush = IMG_BrushCreate(Gvp.size, Gvp.size, Gvp.r, Gvp.g, Gvp.b, Gvp.a);
if (!brush) {
error("Can not create brush"); return;
error("Can't create brush"); return;
}
persp(PERSP_VIEW);
@@ -1516,7 +1516,7 @@ void face_draw()
}
if (warn_packed_file) {
error("Painting in packed images not supported: %s", warn_packed_file);
error("Painting in packed images is not supported: %s", warn_packed_file);
}
persp(PERSP_WIN);
@@ -1543,7 +1543,7 @@ void get_same_uv(void)
ob = OBACT;
if (!(ob->lay & G.vd->lay)) {
error("Active object not in this layer!");
error("The active object is not in this layer");
return;
}
me = get_mesh(ob);
@@ -1565,7 +1565,7 @@ void get_same_uv(void)
}
if(!foundtex) {
error("No active face or active face has no UV-texture");
error("No active face, or active face has no UV texture");
return;
}