diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-08-06 02:45:13 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-08-06 02:45:13 +0400 |
| commit | c689a2ea8c016d3dffda73fc5916ad2717ffc2e1 (patch) | |
| tree | b76bacbe6f109671415e1744abb9dadb929a56b1 /source/blender/editors/space_view3d | |
| parent | 2c331302773bfbd725c1a9a102b7e637a46a2a2f (diff) | |
| parent | 4cf531f7a05434a9bbd6144a7ec0314e60aaff40 (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2014-cyclessoc-2014-cycles
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 8d39632e210..13e010d2f97 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -7183,7 +7183,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short if (ob->restrictflag & OB_RESTRICT_RENDER) return; - if (!has_particles && (ob->transflag & OB_DUPLI)) + if (!has_particles && (ob->transflag & (OB_DUPLI & ~OB_DUPLIFRAMES))) return; } } diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 1d3371abd92..4ca9eea578c 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -465,11 +465,13 @@ void ED_view3d_quadview_update(ScrArea *sa, ARegion *ar, bool do_clip) * properties are always being edited, weak */ viewlock = rv3d->viewlock; - if ((viewlock & RV3D_LOCKED) == 0) + if ((viewlock & RV3D_LOCKED) == 0) { + do_clip = (viewlock & RV3D_BOXCLIP) != 0; viewlock = 0; - else if ((viewlock & RV3D_BOXVIEW) == 0) { - viewlock &= ~RV3D_BOXCLIP; + } + else if ((viewlock & RV3D_BOXVIEW) == 0 && (viewlock & RV3D_BOXCLIP) != 0) { do_clip = true; + viewlock &= ~RV3D_BOXCLIP; } for (; ar; ar = ar->prev) { |