Blender Git Commits

Merge branch 'master' into temp_localview_split

Conflicts:
source/blender/makesrna/intern/rna_space.c

Move inline function defines into own source file

Merge branch 'master' into temp_localview_split

Conflicts:
source/blender/blenloader/intern/versioning_270.c

Merge branch 'master' into temp_localview_split

Merge branch 'master' into temp_localview_split

Conflicts:
source/blender/blenloader/intern/versioning_270.c

Add/use BKE object visibility checks using correct logic

Avoids code duplication and makes handling visibility easier (also for my further layer manager work).

Was a bit afraid of doing this since I wasn't sure if it's possible to handle all cases nicely, but turned out to work quite well and it really improves readability.

Make Cycles work with new local view

Merge branch 'master' into temp_localview_split

Expose object local view data in RNA too

Expose new local view in RNA

Make compatibility work properly

Cleanup: Replace macro with function

Merge branch 'master' into temp_localview_split

Conflicts:
source/blender/editors/object/object_relations.c

Cleanup: Leftover from macro->function conversion

Adjust local view checks in base macros

Merge branch 'master' into temp_localview_split

Update comment

Fix viewport not updating layers when changing out of local view

Some more tweaks for local view checks

Add security check for View3D.lay behavior