Blender Git Commits

Merge branch 'master' into temp_display_optimization

Another fix for particle instance modifier.

Was using inconsistent particle indices, leading to invalid array
offsets.

Fix for broken particle stuff when using particle instance modifier with
children.

Merge branch 'master' into gooseberry

Conflicts:
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/makesrna/intern/rna_nodetree.c

Disable OpenVDB by default.

Fix error with vertex color upload for subsurf

Fix for broken particle stuff when using particle instance modifier with
children.

Subsurf VBOs now properly supports colors

Semi fix UVs not working in higher level. Looks like issue is mesh
colors somehow being used. Disabled for now but real fix would be to
investigate why they are there in first place.

First version of textured subsurf drawing with VBOs and index buffers.

TODOs:

* UVs fail for high subdivision
* Vertex colors still not supported
* Texture painting still not supported

Fix crash reported on blenderartists

A really bad issue that meant we would miscount many mixed triangle/quad
meshes.

Merge remote-tracking branch 'origin/master' into decklink

WIP code that handles textured drawing for subsurf with vertex buffers.

Merge branch 'master' into temp_display_optimization

Subsurf drawing:

Solid shading uses indexed drawing (textured/GLSL drawing are still not
implemented).

For subsurf we might be able to squeeze more memory but it would only
work for smooth shading and it requires more elaborate counting for all
data upload functions. May be interesting to do in the future though.

Cleanup: Use "elements", the OpenGL term instead of "points", makes it a
bit clearer what the use is intended for.

Merge branch 'master' into temp_display_optimization

Merge branch 'master' into openvdb

Cleanup: colors and gl calls

Merge branch 'master' into temp_display_optimization