Blender Git Loki

Merge branch 'master' into temp-cycles-microdisplacement

Reduce maximum number of image textures on Fermi architecture

The new __patches texture takes up a slot and goes past the limit on Fermi
cards which was causing the kernel to fail to build. To fix this there is now
one less image texture available.

Read subdivision attributes in kernel

We can now store and retrieve attributes for subdivision meshes, tho in some
places behavior of attributes may not be entirely correct yet.

Generate attributes for subdivision meshes

Add support for storing subdivision attributes in Mesh

Copy patches to device memory

Pack patch info into triangle data

Pack data for finding the originating patch of a triangle into unused bytes
in __tri_verts, __tri_vnormal and __tri_vindex. Since these bytes weren't
being used there's no increase in memory usage and we avoid more complicated
logic that would be necessary if this data was stored in attributes.

Remove Mesh::forms_quad array

No longer needed now that we can have quad patches

Sync patches from Blender to Cycles

Add patch primitive to Mesh

Needed for subdivision and proper attribute interpolation

Merge branch 'master' into temp-cycles-microdisplacement

Revert geometry cache

Reverting the geometry cache for now, there's still a lot of work to be done on
the other parts of the subdivision code and the added complexity of the cache
is slowing down development. Will add it back later after things are more
functional. For now this means scenes will potentially use much more memory, so
care should be taken when using the feature.

Merge branch 'microdisp' into temp-cycles-microdisplacement

Change default geometry cache size to 1 GB

256 MB was a little small, and a larger cache will preform better. This will
probably change at some point in the future but for now its better to have a
larger default cache size.

Lower default max_T from 128 to 12

This improves cache performance by reducing the maximum size of subpatches,
making tessellation both less likely to occur and faster. Difference in
performance is theoretically 100 times faster during thrashing as maximum
subpatch surface area is 100 time smaller, tho actual performance will vary.

Merge remote-tracking branch 'origin/master' into temp-cycles-microdisplacement

Conflicts:
intern/cycles/kernel/kernel_globals.h

Fix logic that caused attribute offset correction to be skipped for all attributes on subdivision meshes

Attribute offset correction is still needed on subdivision meshes for all attributes except ATTR_ELEMENT_FACE and
ATTR_ELEMENT_CORNER(_BYTE)

Merge remote-tracking branch 'origin/master' into temp-cycles-microdisplacement

Conflicts:
intern/cycles/render/nodes.cpp

Merge remote-tracking branch 'maiself/microdisp' into temp-cycles-microdisplacement

Allow building without OpenSubdiv

This makes cycles subdivision code respect build options, disabling OSD code paths when desired. Since Catmull-Clark
subdivision requires OSD this subdivision type is unavailable with OSD disabled and linear subdivision will be used as a
fallback.