diff options
author | Joerg Mueller <nexyon@gmail.com> | 2011-08-03 16:44:52 +0400 |
---|---|---|
committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-03 16:44:52 +0400 |
commit | eb9d591898e93dbbe9e28865018175b9da730596 (patch) | |
tree | 3209caefe505273e834a936e54f6146a4185e83b /source/blender/editors/space_view3d | |
parent | 6d7490632f13f9744c6b3e507c838a34f3481846 (diff) | |
parent | f1fb54e126824ff38b8bf26fa80f3f46c886bd45 (diff) |
* Merging trunk up to r38981.
* Fixing a minor issue in a previous commit.
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index eeaf87757ce..ed0b2645c99 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1190,7 +1190,7 @@ int ED_view3d_lock(RegionView3D *rv3d) return TRUE; } -/* dont set windows active in in here, is used by renderwin too */ +/* dont set windows active in here, is used by renderwin too */ void setviewmatrixview3d(Scene *scene, View3D *v3d, RegionView3D *rv3d) { if(rv3d->persp==RV3D_CAMOB) { /* obs/camera */ |