diff options
Diffstat (limited to 'source/blender/editors/space_view3d')
16 files changed, 121 insertions, 56 deletions
diff --git a/source/blender/editors/space_view3d/drawanimviz.c b/source/blender/editors/space_view3d/drawanimviz.c index 11e598aeb59..3913a6c7a16 100644 --- a/source/blender/editors/space_view3d/drawanimviz.c +++ b/source/blender/editors/space_view3d/drawanimviz.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2009 by the Blender Foundation. * All rights reserved. diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index cc3769c70fc..6d44f8dac45 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2005 by the Blender Foundation. * All rights reserved. diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 51c7ba1a4bd..57ab9191bee 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 5c5f0dbc897..732f1c17988 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. @@ -129,6 +129,7 @@ #define CHECK_OB_DRAWFACEDOT(sce, vd, dt) \ ( (sce->toolsettings->selectmode & SCE_SELECT_FACE) && \ (vd->drawtype<=OB_SOLID) && \ + (G.f & G_BACKBUFSEL)==0 && \ (((vd->drawtype==OB_SOLID) && (dt>=OB_SOLID) && (vd->flag2 & V3D_SOLID_TEX) && (vd->flag & V3D_ZBUF_SELECT)) == 0) \ ) @@ -2313,7 +2314,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object draw_dm_face_normals(scene, cageDM); } if(me->drawflag & ME_DRAW_VNORMALS) { - UI_ThemeColor(TH_NORMAL); + UI_ThemeColor(TH_VNORMAL); draw_dm_vert_normals(scene, cageDM); } diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c index 3e4748d4807..004d4a022f6 100644 --- a/source/blender/editors/space_view3d/drawvolume.c +++ b/source/blender/editors/space_view3d/drawvolume.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 97ae94cae26..4a58ad337e3 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. @@ -612,6 +612,8 @@ static void view3d_main_area_listener(ARegion *ar, wmNotifier *wmn) case NC_SCREEN: if(wmn->data == ND_GPENCIL) ED_region_tag_redraw(ar); + else if(wmn->data==ND_ANIMPLAY) + ED_region_tag_redraw(ar); break; } } diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 4adb2b3af26..1fc6ab2fc5b 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2009 Blender Foundation. * All rights reserved. @@ -1469,7 +1469,7 @@ static int view3d_properties(bContext *C, wmOperator *op) void VIEW3D_OT_properties(wmOperatorType *ot) { ot->name= "Properties"; - ot->description= "Toggles the properties panel display."; + ot->description= "Toggles the properties panel display"; ot->idname= "VIEW3D_OT_properties"; ot->exec= view3d_properties; diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index e744252889a..8d2cd6a9903 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. @@ -74,6 +74,7 @@ #include "BIF_glutil.h" #include "WM_api.h" +#include "WM_types.h" #include "BLF_api.h" #include "ED_armature.h" @@ -82,6 +83,7 @@ #include "ED_mesh.h" #include "ED_screen.h" #include "ED_space_api.h" +#include "ED_screen_types.h" #include "ED_util.h" #include "ED_transform.h" #include "ED_types.h" @@ -1726,7 +1728,12 @@ void draw_depth(Scene *scene, ARegion *ar, View3D *v3d, int (* func)(void *)) v3d->transp= FALSE; } + if(rv3d->rflag & RV3D_CLIPPING) + view3d_clr_clipping(); + v3d->zbuf = zbuf; + if(!v3d->zbuf) glDisable(GL_DEPTH_TEST); + U.glalphaclip = glalphaclip; v3d->flag = flag; U.obcenter_dia= obcenter_dia; @@ -1989,6 +1996,57 @@ void ED_view3d_draw_offscreen(Scene *scene, View3D *v3d, ARegion *ar, int winx, glPopMatrix(); } +/* NOTE: the info that this uses is updated in ED_refresh_viewport_fps(), + * which currently gets called during SCREEN_OT_animation_step. + */ +static void draw_viewport_fps(Scene *scene, ARegion *ar) +{ + ScreenFrameRateInfo *fpsi= scene->fps_info; + float fps; + char printable[16]; + int i, tot; + + if (!fpsi || !fpsi->lredrawtime || !fpsi->redrawtime) + return; + + printable[0] = '\0'; + +#if 0 + /* this is too simple, better do an average */ + fps = (float)(1.0/(fpsi->lredrawtime-fpsi->redrawtime)) +#else + fpsi->redrawtimes_fps[fpsi->redrawtime_index] = (float)(1.0/(fpsi->lredrawtime-fpsi->redrawtime)); + + for (i=0, tot=0, fps=0.0f ; i < REDRAW_FRAME_AVERAGE ; i++) { + if (fpsi->redrawtimes_fps[i]) { + fps += fpsi->redrawtimes_fps[i]; + tot++; + } + } + if (tot) { + fpsi->redrawtime_index = (fpsi->redrawtime_index + 1) % REDRAW_FRAME_AVERAGE; + + //fpsi->redrawtime_index++; + //if (fpsi->redrawtime >= REDRAW_FRAME_AVERAGE) + // fpsi->redrawtime = 0; + + fps = fps / tot; + } +#endif + + /* is this more then half a frame behind? */ + if (fps+0.5 < FPS) { + UI_ThemeColor(TH_REDALERT); + sprintf(printable, "fps: %.2f", (float)fps); + } + else { + UI_ThemeColor(TH_TEXT_HI); + sprintf(printable, "fps: %i", (int)(fps+0.5)); + } + + BLF_draw_default(22, ar->winy-17, 0.0f, printable); +} + void view3d_main_area_draw(const bContext *C, ARegion *ar) { Scene *scene= CTX_data_scene(C); @@ -2121,8 +2179,6 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar) view3d_update_depths(ar, v3d); } - ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW); - // REEB_draw(); // if(scene->radio) RAD_drawall(v3d->drawtype>=OB_SOLID); @@ -2131,6 +2187,8 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar) view3d_draw_transp(scene, ar, v3d); view3d_draw_xray(scene, ar, v3d, 1); // clears zbuffer if it is used! + ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW); + if(!retopo && sculptparticle && (obact && (OBACT->dtx & OB_DRAWXRAY))) { view3d_update_depths(ar, v3d); } @@ -2176,8 +2234,10 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar) else draw_view_icon(rv3d); - /* XXX removed viewport fps */ - if(U.uiflag & USER_SHOW_VIEWPORTNAME) { + if((U.uiflag & USER_SHOW_FPS) && (CTX_wm_screen(C)->animtimer)) { + draw_viewport_fps(scene, ar); + } + else if(U.uiflag & USER_SHOW_VIEWPORTNAME) { draw_viewport_name(ar, v3d); } if (grid_unit) { /* draw below the viewport name */ diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index df1a8e29520..81a508de139 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. @@ -766,7 +766,7 @@ void VIEW3D_OT_rotate(wmOperatorType *ot) /* identifiers */ ot->name= "Rotate view"; - ot->description = "Rotate the view."; + ot->description = "Rotate the view"; ot->idname= "VIEW3D_OT_rotate"; /* api callbacks */ @@ -909,7 +909,7 @@ void VIEW3D_OT_move(wmOperatorType *ot) /* identifiers */ ot->name= "Move view"; - ot->description = "Move the view."; + ot->description = "Move the view"; ot->idname= "VIEW3D_OT_move"; /* api callbacks */ @@ -1218,7 +1218,7 @@ void VIEW3D_OT_zoom(wmOperatorType *ot) { /* identifiers */ ot->name= "Zoom view"; - ot->description = "Zoom in/out in the view."; + ot->description = "Zoom in/out in the view"; ot->idname= "VIEW3D_OT_zoom"; /* api callbacks */ @@ -1303,6 +1303,8 @@ static int viewhome_exec(bContext *C, wmOperator *op) /* was view3d_home() in 2. if(rv3d->viewlock & RV3D_BOXVIEW) view3d_boxview_copy(CTX_wm_area(C), ar); + + WM_event_add_notifier(C, NC_SPACE|ND_SPACE_VIEW3D, v3d); return OPERATOR_FINISHED; } @@ -1311,7 +1313,7 @@ void VIEW3D_OT_view_all(wmOperatorType *ot) { /* identifiers */ ot->name= "View All"; - ot->description = "View all objects in scene."; + ot->description = "View all objects in scene"; ot->idname= "VIEW3D_OT_view_all"; /* api callbacks */ @@ -1456,7 +1458,7 @@ void VIEW3D_OT_view_selected(wmOperatorType *ot) /* identifiers */ ot->name= "View Selected"; - ot->description = "Move the view to the selection center."; + ot->description = "Move the view to the selection center"; ot->idname= "VIEW3D_OT_view_selected"; /* api callbacks */ @@ -1501,7 +1503,7 @@ void VIEW3D_OT_view_center_cursor(wmOperatorType *ot) { /* identifiers */ ot->name= "Center View to Cursor"; - ot->description= "Centers the view so that the cursor is in the middle of the view."; + ot->description= "Centers the view so that the cursor is in the middle of the view"; ot->idname= "VIEW3D_OT_view_center_cursor"; /* api callbacks */ @@ -1574,7 +1576,7 @@ void VIEW3D_OT_render_border(wmOperatorType *ot) { /* identifiers */ ot->name= "Set Render Border"; - ot->description = "Set the boundries of the border render and enables border render ."; + ot->description = "Set the boundries of the border render and enables border render "; ot->idname= "VIEW3D_OT_render_border"; /* api callbacks */ @@ -1748,7 +1750,7 @@ void VIEW3D_OT_zoom_border(wmOperatorType *ot) /* identifiers */ ot->name= "Border Zoom"; - ot->description = "Zoom in the view to the nearest object contained in the border."; + ot->description = "Zoom in the view to the nearest object contained in the border"; ot->idname= "VIEW3D_OT_zoom_border"; /* api callbacks */ @@ -1956,7 +1958,7 @@ void VIEW3D_OT_viewnumpad(wmOperatorType *ot) { /* identifiers */ ot->name= "View numpad"; - ot->description = "Set the view."; + ot->description = "Set the view"; ot->idname= "VIEW3D_OT_viewnumpad"; /* api callbacks */ @@ -2026,7 +2028,7 @@ void VIEW3D_OT_view_orbit(wmOperatorType *ot) { /* identifiers */ ot->name= "View Orbit"; - ot->description = "Orbit the view."; + ot->description = "Orbit the view"; ot->idname= "VIEW3D_OT_view_orbit"; /* api callbacks */ @@ -2076,7 +2078,7 @@ void VIEW3D_OT_view_pan(wmOperatorType *ot) { /* identifiers */ ot->name= "View Pan"; - ot->description = "Pan the view."; + ot->description = "Pan the view"; ot->idname= "VIEW3D_OT_view_pan"; /* api callbacks */ @@ -2108,7 +2110,7 @@ void VIEW3D_OT_view_persportho(wmOperatorType *ot) { /* identifiers */ ot->name= "View Persp/Ortho"; - ot->description = "Switch the current view from perspective/orthographic."; + ot->description = "Switch the current view from perspective/orthographic"; ot->idname= "VIEW3D_OT_view_persportho"; /* api callbacks */ @@ -2148,7 +2150,7 @@ void VIEW3D_OT_add_background_image(wmOperatorType *ot) { /* identifiers */ ot->name = "Add Background Image"; - ot->description= "Add a new background image."; + ot->description= "Add a new background image"; ot->idname = "VIEW3D_OT_add_background_image"; /* api callbacks */ @@ -2281,7 +2283,7 @@ void VIEW3D_OT_clip_border(wmOperatorType *ot) /* identifiers */ ot->name= "Clipping Border"; - ot->description = "Set the view clipping border."; + ot->description = "Set the view clipping border"; ot->idname= "VIEW3D_OT_clip_border"; /* api callbacks */ @@ -2366,7 +2368,7 @@ void VIEW3D_OT_cursor3d(wmOperatorType *ot) /* identifiers */ ot->name= "Set 3D Cursor"; - ot->description = "Set the location of the 3D cursor."; + ot->description = "Set the location of the 3D cursor"; ot->idname= "VIEW3D_OT_cursor3d"; /* api callbacks */ @@ -2408,7 +2410,7 @@ void VIEW3D_OT_manipulator(wmOperatorType *ot) /* identifiers */ ot->name= "3D Manipulator"; - ot->description = "Manipulate selected item by axis."; + ot->description = "Manipulate selected item by axis"; ot->idname= "VIEW3D_OT_manipulator"; /* api callbacks */ @@ -2442,7 +2444,7 @@ void VIEW3D_OT_enable_manipulator(wmOperatorType *ot) { /* identifiers */ ot->name= "Enable 3D Manipulator"; - ot->description = "Enable the transform manipulator for use."; + ot->description = "Enable the transform manipulator for use"; ot->idname= "VIEW3D_OT_enable_manipulator"; /* api callbacks */ diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index d3569034dff..af03662c524 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2004-2008 Blender Foundation. * All rights reserved. @@ -261,7 +261,7 @@ void VIEW3D_OT_layers(wmOperatorType *ot) { /* identifiers */ ot->name= "Layers"; - ot->description= "Toggle layer(s) visibility."; + ot->description= "Toggle layer(s) visibility"; ot->idname= "VIEW3D_OT_layers"; /* api callbacks */ diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index bdcaa4a7e32..233369e2173 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 2192eb13cd0..792153cab08 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index c44b7ec6b59..26214715805 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. @@ -784,7 +784,7 @@ static int view3d_lasso_select_exec(bContext *C, wmOperator *op) void VIEW3D_OT_select_lasso(wmOperatorType *ot) { ot->name= "Lasso Select"; - ot->description= "Select items using lasso selection."; + ot->description= "Select items using lasso selection"; ot->idname= "VIEW3D_OT_select_lasso"; ot->invoke= WM_gesture_lasso_invoke; @@ -1704,7 +1704,7 @@ void VIEW3D_OT_select_border(wmOperatorType *ot) { /* identifiers */ ot->name= "Border Select"; - ot->description= "Select items using border selection."; + ot->description= "Select items using border selection"; ot->idname= "VIEW3D_OT_select_border"; /* api callbacks */ @@ -1770,7 +1770,7 @@ void VIEW3D_OT_select(wmOperatorType *ot) { /* identifiers */ ot->name= "Activate/Select"; - ot->description= "Activate/select item(s)."; + ot->description= "Activate/select item(s)"; ot->idname= "VIEW3D_OT_select"; /* api callbacks */ @@ -2100,7 +2100,7 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op) void VIEW3D_OT_select_circle(wmOperatorType *ot) { ot->name= "Circle Select"; - ot->description= "Select items using circle selection."; + ot->description= "Select items using circle selection"; ot->idname= "VIEW3D_OT_select_circle"; ot->invoke= WM_gesture_circle_invoke; diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 6d2638154d2..ada0462a8ff 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. @@ -555,7 +555,7 @@ void VIEW3D_OT_snap_selected_to_grid(wmOperatorType *ot) /* identifiers */ ot->name= "Snap Selection to Grid"; - ot->description= "Snap selected item(s) to nearest grid node."; + ot->description= "Snap selected item(s) to nearest grid node"; ot->idname= "VIEW3D_OT_snap_selected_to_grid"; /* api callbacks */ @@ -680,7 +680,7 @@ void VIEW3D_OT_snap_selected_to_cursor(wmOperatorType *ot) /* identifiers */ ot->name= "Snap Selection to Cursor"; - ot->description= "Snap selected item(s) to cursor."; + ot->description= "Snap selected item(s) to cursor"; ot->idname= "VIEW3D_OT_snap_selected_to_cursor"; /* api callbacks */ @@ -717,7 +717,7 @@ void VIEW3D_OT_snap_cursor_to_grid(wmOperatorType *ot) /* identifiers */ ot->name= "Snap Cursor to Grid"; - ot->description= "Snap cursor to nearest grid node."; + ot->description= "Snap cursor to nearest grid node"; ot->idname= "VIEW3D_OT_snap_cursor_to_grid"; /* api callbacks */ @@ -824,7 +824,7 @@ void VIEW3D_OT_snap_cursor_to_selected(wmOperatorType *ot) /* identifiers */ ot->name= "Snap Cursor to Selected"; - ot->description= "Snap cursor to center of selected item(s)."; + ot->description= "Snap cursor to center of selected item(s)"; ot->idname= "VIEW3D_OT_snap_cursor_to_selected"; /* api callbacks */ @@ -875,7 +875,7 @@ void VIEW3D_OT_snap_cursor_to_active(wmOperatorType *ot) /* identifiers */ ot->name= "Snap Cursor to Active"; - ot->description= "Snap cursor to active item."; + ot->description= "Snap cursor to active item"; ot->idname= "VIEW3D_OT_snap_cursor_to_active"; /* api callbacks */ @@ -1072,7 +1072,7 @@ void VIEW3D_OT_snap_selected_to_center(wmOperatorType *ot) /* identifiers */ ot->name= "Snap Selection to Center"; - ot->description= "Snap selected items to selections geometric center."; + ot->description= "Snap selected items to selections geometric center"; ot->idname= "VIEW3D_OT_snap_selected_to_center"; /* api callbacks */ diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c index 8d354c1b565..4a103da6d3c 100644 --- a/source/blender/editors/space_view3d/view3d_toolbar.c +++ b/source/blender/editors/space_view3d/view3d_toolbar.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2009 Blender Foundation. * All rights reserved. @@ -330,7 +330,7 @@ static int view3d_toolshelf(bContext *C, wmOperator *op) void VIEW3D_OT_toolshelf(wmOperatorType *ot) { ot->name= "Tool Shelf"; - ot->description= "Toggles tool shelf display."; + ot->description= "Toggles tool shelf display"; ot->idname= "VIEW3D_OT_toolshelf"; ot->exec= view3d_toolshelf; diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 27e8b850d52..e9b277d509a 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. @@ -452,7 +452,7 @@ void VIEW3D_OT_setcameratoview(wmOperatorType *ot) /* identifiers */ ot->name= "Align Camera To View"; - ot->description= "Set camera view to active view."; + ot->description= "Set camera view to active view"; ot->idname= "VIEW3D_OT_camera_to_view"; /* api callbacks */ @@ -488,7 +488,7 @@ void VIEW3D_OT_setobjectascamera(wmOperatorType *ot) /* identifiers */ ot->name= "Set Active Object as Camera"; - ot->description= "Set the active object as the active camera for this view or scene."; + ot->description= "Set the active object as the active camera for this view or scene"; ot->idname= "VIEW3D_OT_object_as_camera"; /* api callbacks */ @@ -1610,7 +1610,7 @@ void VIEW3D_OT_localview(wmOperatorType *ot) /* identifiers */ ot->name= "Local View"; - ot->description= "Toggle display of selected object(s) separately and centered in view."; + ot->description= "Toggle display of selected object(s) separately and centered in view"; ot->idname= "VIEW3D_OT_localview"; /* api callbacks */ @@ -1815,7 +1815,7 @@ void VIEW3D_OT_game_start(wmOperatorType *ot) /* identifiers */ ot->name= "Start Game Engine"; - ot->description= "Start game engine."; + ot->description= "Start game engine"; ot->idname= "VIEW3D_OT_game_start"; /* api callbacks */ @@ -2595,7 +2595,7 @@ void VIEW3D_OT_fly(wmOperatorType *ot) /* identifiers */ ot->name= "Fly Navigation"; - ot->description= "Interactively fly around the scene."; + ot->description= "Interactively fly around the scene"; ot->idname= "VIEW3D_OT_fly"; /* api callbacks */ |