griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

edit to r43487

Browse Source 
- make red outline more obvious (was hard to see when the camera was selected)
- remove text, red-alert text IMHO should only be used when something is wrong (example - its used when FPS cant keep up), but this is just information.
  realize out UI isnt dealing well with added view3d options but dont think its good to solve by displaying options as text overlay.
  red outline for the camera is just a hint which users notice when enabling the camera, think its acceptable.
This commit is contained in:
Campbell Barton
2012-01-18 11:10:02 +00:00
parent dcceda33a6
commit 9ba8f57d58
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/editors/space_view3d/view3d_draw.c
View File

@@ -829,16 +829,6 @@ static void draw_viewport_name(ARegion *ar, View3D *v3d)
}
}
static void draw_camera_view_locked(ARegion *ar, View3D *v3d)
{
RegionView3D *rv3d= ar->regiondata;
if (v3d->flag2 & V3D_LOCK_CAMERA && rv3d->persp==RV3D_CAMOB) {
UI_ThemeColor(TH_REDALERT);
BLF_draw_default_ascii(22, ar->winy-28, 0.0f, "Camera is LOCKED to view", BLF_DRAW_STR_DUMMY_MAX);
}
}
/* draw info beside axes in bottom left-corner:
* framenum, object name, bone name (if available), marker name (if available)
*/
@@ -1107,11 +1097,8 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
setlinestyle(0);
if (v3d->flag2 & V3D_LOCK_CAMERA)
UI_ThemeColor(TH_REDALERT);
else
UI_ThemeColor(TH_BACK);
UI_ThemeColor(TH_BACK);
glRectf(x1i, y1i, x2i, y2i);
@@ -1124,6 +1111,13 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
#endif
setlinestyle(3);
/* outer line not to confuse with object selecton */
if (v3d->flag2 & V3D_LOCK_CAMERA) {
UI_ThemeColor(TH_REDALERT);
glRectf(x1i - 1, y1i - 1, x2i + 1, y2i + 1);
}
UI_ThemeColor(TH_WIRE);
glRectf(x1i, y1i, x2i, y2i);
@@ -2905,8 +2899,6 @@ static void view3d_main_area_draw_info(const bContext *C, ARegion *ar, const cha
draw_viewport_name(ar, v3d);
}
draw_camera_view_locked(ar, v3d);
if (grid_unit) { /* draw below the viewport name */
char numstr[32]= "";