Campbell Barton b65ea517eb Merge branch 'master' into blender2.8 ...

- Undo that changes modes currently asserts,
  since undo is now screen data.

  Most likely we will change how object mode and workspaces work
  since it's not practical/maintainable at the moment.

- Removed view_layer from particle settings
  (wasn't needed and complicated undo).

2018-04-01 11:03:25 +02:00

..

CMakeLists.txt

Fix compilation error with Collada enabled

2017-07-21 17:44:11 +02:00

io_alembic.c

Merge branch 'master' into blender2.8

2018-03-16 04:35:37 +01:00

io_alembic.h

Basic Alembic support

2016-08-06 10:58:13 +02:00

io_cache.c

Cleanup: remove global header

2018-04-01 07:24:45 +02:00

io_cache.h

Basic Alembic support

2016-08-06 10:58:13 +02:00

io_collada.c

merge from master (needed to fix collada headerfiles which have been modified in master and in blender2.8 slightly different)

2018-02-28 17:29:56 +01:00

io_collada.h

code clenup: comments and some style edits on ghost/osx (odd indentation)

2012-09-06 02:10:09 +00:00

io_ops.c

Basic Alembic support

2016-08-06 10:58:13 +02:00

io_ops.h

code clenup: comments and some style edits on ghost/osx (odd indentation)

2012-09-06 02:10:09 +00:00