Blender Git Commits

WIP Ptex texture packing

Silence warning in Ptex

Update CMakeLists for ptex

Import ptex-2.0.42 into extern/ptex

WIP add Ptex UVs to Cycles mesh

Tweak texture-coord node to add Ptex UVs

Temporary customdata mask tweak

Tesselation for Ptex loop layer

Temporary change to add-vcol operator to also add Ptex loop layer

RNA updates for Ptex

Move Cycles' Ptex attribute from vertices to corners

Add a couple new CustomData layers for Ptex

Add some Ptex types to Mesh SDNA

De-duplicate large block of shared code for GL vert attribs

Code in ccgdm_draw_attrib_vertex() was entirely the same as the top
portion of the code in cddm_draw_attrib_vertex(). Moved this code to a
new function, DM_draw_attrib_vertex().

ccgdm_draw_attrib_vertex() was removed in favor of calling
DM_draw_attrib_vertex(). cddm_draw_attrib_vertex() still does a couple
extra things, so it still exists but calls DM_draw_attrib_vertex().

In the interest of easy code review, no changes made to the code in
DM_draw_attrib_vertex() other than the new name and an added comment.

Reviewers: campbellbarton

Differential Revision: https://developer.blender.org/D1010

Depsgraph: Use straight-lines for graphviz debug

Trying straight/orthogonal lines for relationships in graphviz debug graphs
instead of the curved defaults. The curvy lines were clumping together in confusing
ways, making it hard to tell what's going on. Still, this isn't much better, but
can at least see what's going on in the file I'm debugging.

Merge branch 'master' into gooseberry

Conflicts:
release/scripts/startup/bl_ui/properties_particle.py
source/blender/physics/intern/BPH_mass_spring.cpp

Bugfix T43293: Crash when editing shared GPencil datablock in VSE

The problem here was that when a Grease Pencil datablock is shared between
the 3D view and another one of the editors, all the strokes were getting handled
by the editing operators, even if those strokes could not be displayed/used
in that context. As a result, the coordinate conversion methods would fail,
as some of the needed data would not be set.

The fix here involves not including any offending strokes in such cases...

Conflicts:
source/blender/editors/gpencil/gpencil_edit.c

Merge branch 'master' into gooseberry

Conflicts:
release/scripts/startup/bl_ui/properties_particle.py
source/blender/blenkernel/BKE_cloth.h
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/physics/particle_edit.c
source/blender/makesdna/DNA_particle_types.h
source/blender/physics/BPH_mass_spring.h
source/blender/physics/intern/BPH_mass_spring.cpp
source/blender/physics/intern/implicit_blender.c

Fix error in freestyle api

Fix own error in freestyle api

Conflicts:
source/blender/freestyle/intern/python/BPy_ViewShape.cpp