diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-08-11 09:04:01 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-11 09:04:01 +0400 |
| commit | ef18ec335ff8496d1a047615073c7258eeffa371 (patch) | |
| tree | 0da45af24c4b9f4055390a9640bf0d59613605bc /source/blender/editors/space_view3d/drawobject.c | |
| parent | 17e88915fdd7048365df1be48d615d69c0924b4c (diff) | |
| parent | 50277c48ba5bf9eae418453159e421489895dafd (diff) | |
svn merge -r39145:39286 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 86d3ddc3353..3746428b0c6 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -5781,7 +5781,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) /* if( ((int)ob->ctime) != F_(scene->r.cfra)) where_is_object(scene, ob); */ /* draw motion paths (in view space) */ - if (ob->mpath) { + if (ob->mpath && (v3d->flag2 & V3D_RENDER_OVERRIDE)==0) { bAnimVizSettings *avs= &ob->avs; /* setup drawing environment for paths */ |