diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-05 03:13:28 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-05 03:13:28 +0400 |
commit | f07df7287e60ede904993572fe9bfef2c3a324af (patch) | |
tree | 205c89f1890164ad384dcd3e5d09547d44287ee3 /source/blender/editors/transform/transform_generics.c | |
parent | 3267a619f1e1a5b5508e38cbc665da79f450b2e3 (diff) |
manual sync with trunk - pulling in changes where the issues are not bmesh spesific
- some merges added lines in multiple times
- removed some NULL checks that were only in bmesh
- enable cycles by default (was disabled because it used not to work)
- make formatting match
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index d349dfac2fe..d4a68ff8bfc 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -704,7 +704,6 @@ static void recalcData_view3d(TransInfo *t) calchandlesNurb(nu); /* Cant do testhandlesNurb here, it messes up the h1 and h2 flags */ nu= nu->next; } - } else { /* Normal updating */ |