diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-11 18:14:04 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-11 18:14:04 +0400 |
commit | b308e613126f8c89e954705aa512a3ef6a1f551d (patch) | |
tree | 4a875450b2ba9766fbdf4914e8cb003e8132497c /source/blender/editors/include | |
parent | 98bdf0274b1052efe25b6216f488d2a40fa43d1c (diff) | |
parent | cda5d1769d71832a6b04ed6c91bac101c482e5f7 (diff) |
svn merge ^/trunk/blender -r43220:43278 --accept postpone
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_view3d.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index a8158185f90..959deecd990 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -291,7 +291,8 @@ void ED_view3d_quadview_update(struct ScrArea *sa, struct ARegion *ar, short do_ int ED_view3d_lock(struct RegionView3D *rv3d); uint64_t ED_view3d_datamask(struct Scene *scene, struct View3D *v3d); -uint64_t ED_viewedit_datamask(struct bScreen *screen); +uint64_t ED_view3d_screen_datamask(struct bScreen *screen); +uint64_t ED_view3d_object_datamask(struct Scene *scene); /* camera lock functions */ int ED_view3d_camera_lock_check(struct View3D *v3d, struct RegionView3D *rv3d); |