diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-14 23:45:21 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-14 23:45:21 +0400 |
commit | 2ab2423b06a81b8bccbe496f33a8a1fc8a8204ae (patch) | |
tree | 21388c3c3fa4966239460132ebb72d03239e6773 /source/blender/editors/space_view3d/view3d_draw.c | |
parent | ff82aa8677236ace9686681ee64f06e191d171c3 (diff) |
Cycles:
* Fix #29257: nan-pixels with zero roughness for glass/glossy.
* Fix #29239: crash with border rendering, this is not working yet, but should
no longer crash now.
* Show object name in 3d view rendered draw type.
* Attempt to improve Sample as Light option description.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_draw.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index edcaed43de6..7ce758d4f47 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2878,6 +2878,10 @@ static void view3d_main_area_draw_info(const bContext *C, ARegion *ar, const cha 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; @@ -2899,10 +2903,6 @@ static void view3d_main_area_draw_info(const bContext *C, ARegion *ar, const cha BLF_draw_default_ascii(22, ar->winy-(USER_SHOW_VIEWPORTNAME?40:20), 0.0f, tstr[0]?tstr : grid_unit, sizeof(tstr)); /* XXX, use real length */ } - - ob= OBACT; - if(U.uiflag & USER_DRAWVIEWINFO) - draw_selected_name(scene, ob); } void view3d_main_area_draw(const bContext *C, ARegion *ar) |