[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51606] trunk/blender/source/blender: hide text overlays when 'Only Render' option is enabled.
Campbell Barton
ideasman42 at gmail.com
Thu Oct 25 05:10:41 CEST 2012
Revision: 51606
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51606
Author: campbellbarton
Date: 2012-10-25 03:10:35 +0000 (Thu, 25 Oct 2012)
Log Message:
-----------
hide text overlays when 'Only Render' option is enabled.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/context.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
Modified: trunk/blender/source/blender/blenkernel/intern/context.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/context.c 2012-10-25 02:57:55 UTC (rev 51605)
+++ trunk/blender/source/blender/blenkernel/intern/context.c 2012-10-25 03:10:35 UTC (rev 51606)
@@ -234,9 +234,8 @@
static void *ctx_wm_python_context_get(const bContext *C, const char *member, void *fall_through)
{
#ifdef WITH_PYTHON
- bContextDataResult result;
-
- if (C && CTX_py_dict_get(C)) {
+ if (UNLIKELY(C && CTX_py_dict_get(C))) {
+ bContextDataResult result;
memset(&result, 0, sizeof(bContextDataResult));
BPY_context_member_get((bContext *)C, member, &result);
if (result.ptr.data)
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2012-10-25 02:57:55 UTC (rev 51605)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2012-10-25 03:10:35 UTC (rev 51606)
@@ -3144,8 +3144,6 @@
View3D *v3d = CTX_wm_view3d(C);
RegionView3D *rv3d = CTX_wm_region_view3d(C);
- Object *ob;
-
if (rv3d->persp == RV3D_CAMOB) {
drawviewborder(scene, ar, v3d);
}
@@ -3162,44 +3160,48 @@
}
if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
+ Object *ob;
+
/* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */
// if (v3d->flag2 & V3D_DISPGP)
draw_gpencil_view3d(scene, v3d, ar, 0);
drawcursor(scene, ar, v3d);
+
+ if (U.uiflag & USER_SHOW_ROTVIEWICON)
+ draw_view_axis(rv3d);
+ else
+ draw_view_icon(rv3d);
+
+ ob = OBACT;
+ if (U.uiflag & USER_DRAWVIEWINFO)
+ draw_selected_name(scene, ob);
}
-
- if (U.uiflag & USER_SHOW_ROTVIEWICON)
- draw_view_axis(rv3d);
- else
- draw_view_icon(rv3d);
-
- ob = OBACT;
- if (U.uiflag & USER_DRAWVIEWINFO)
- draw_selected_name(scene, ob);
if (rv3d->render_engine) {
view3d_main_area_draw_engine_info(rv3d, ar);
return;
}
- if ((U.uiflag & USER_SHOW_FPS) && ED_screen_animation_playing(wm)) {
- draw_viewport_fps(scene, ar);
- }
- else if (U.uiflag & USER_SHOW_VIEWPORTNAME) {
- draw_viewport_name(ar, v3d);
- }
+ if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
+ if ((U.uiflag & USER_SHOW_FPS) && ED_screen_animation_playing(wm)) {
+ 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 */
- char numstr[32] = "";
+ if (grid_unit) { /* draw below the viewport name */
+ char numstr[32] = "";
- UI_ThemeColor(TH_TEXT_HI);
- if (v3d->grid != 1.0f) {
- BLI_snprintf(numstr, sizeof(numstr), "%s x %.4g", grid_unit, v3d->grid);
+ UI_ThemeColor(TH_TEXT_HI);
+ if (v3d->grid != 1.0f) {
+ BLI_snprintf(numstr, sizeof(numstr), "%s x %.4g", grid_unit, v3d->grid);
+ }
+
+ BLF_draw_default_ascii(22, ar->winy - (USER_SHOW_VIEWPORTNAME ? 40 : 20), 0.0f,
+ numstr[0] ? numstr : grid_unit, sizeof(numstr));
}
-
- BLF_draw_default_ascii(22, ar->winy - (USER_SHOW_VIEWPORTNAME ? 40 : 20), 0.0f,
- numstr[0] ? numstr : grid_unit, sizeof(numstr));
}
}
More information about the Bf-blender-cvs
mailing list