Blender Git Commits

Update CMakeLists for ptex

Import ptex-2.0.42 into extern/ptex

Merge branch 'master' into asset-experiments

Conflicts:
release/scripts/startup/bl_operators/wm.py

Merge branch 'master' into gooseberry

Merge branch 'master' into temp_custom_loop_normals

Disabled the child hair hull drawing feature.

This is incompatible with particle data structures in their current form.
Hull drawing requires sorting child particles based on the distance from
their primary parent. However, this changes the order of children, which
is the main method of generating random numbers for them. In the
viewport this is not a problem, but when rendering the children are
constantly recreated, using the respective deformed emitter mesh each
time. This leads to changing child orders when using the convex hull
sorting, and therefore different randomisation values.

To properly implement child hull drawing we would have to generate a
stable parent-child offset metric as well as avoiding any resorting in
the actual data arrays. This in turn requires terribly inefficient
drawing iteration, which could become a bottleneck by itself even before
taking cache coherence or OpenGL optimization requirements into account
(collecting child data into a dedicated buffer for drawing).

Depsgraph: headers cleanup

Mainly avoid headers include from headers.

Depsgraph: Fix compilation error after ogdf commit

CMake should work now (ogdf stays disabled), should be no functional
changes for scons.

Depsgraph WIP: Ensure edges get added between nodes to show ownership hierarchies

We can't really test that this looks right yet, since we don't have a layout
algorithm working, but when this works, it will be necessary for identifying
what an opnode is for.

Comment out the proxy fix to test if it makes things better,

Depsgraph WIP: Stubbed in a few different layout engines for OGDF - still no dice

Depsgraph WIP: Disable superfluous debug prints

Depsgraph WIP: Removing unnecessary attributes for graph

These were resulting in nodes being created with sizes of 0,0, as those flags
expect that you manually set what you want.

Depsgraph WIP: Basic support for OGDF export

This introduces initial preliminary support for OGDF export, including the
code to populate the graph, and all the supporting operator/rna stuff.
Much of this has been copied + adapted from the code for the GraphViz
exporting, though we are likely to need to adapt this later on.

* Currently, there is no layout engine used, so the exported graph won't look
like anything exists. But, at least all the data does get exported.

* Debugging Note: Crashes related to the ogdf string class when assigning to attributes
occur if you don't set the GraphAttributes flag corresponding to that attribute.

Merge branch 'master' into gooseberry

Quick test to figure out performance bottleneck in gooseberry.

Failed proxies will now attempt to fetch a smaller proxy first before
fetching the full resolution. This might allow us to see if we are
hitting a bandwidth issue (due to high res) or a file query issue (due
to more file queries)

Merge branch 'master' into gooseberry

Depsgraph WIP: Start of OGDF graph export

Useful Notes:
* The OGDF headers have to come before the Blender ones, or else the code will
NOT compile under mingw64 (and potentially a few others). In particular, this
results in many non-sensical errors in windef.h, windows.h, and winreg.h, potentially
arising from redefined or already defined constants.

Merge branch 'master' into gooseberry

Wire-color was accidentally broken in a merge

Adding back changes to background needed for auto-contrast.