Blender Git Commits

Merge branch 'master' into temp_manipulators_core

correct path parsing for smoke script

Bring back stuff removed in temp_manipulators_core

Was removed for merge into blender2.8, but we still need it in this branch.

Merge branch 'temp_manipulators_core' into custom-manipulators

Conflicts:
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_view3d_types.h

fixed temp directory for highres liquids (correct temp directory)

fixed some more transform issues with dynamic fracture, added openmp for loop for boolean fracturing

Remove unneeded UserPref options

At least initial merge we don't need them.

Remove any remaining OpenGL calls

This branch is likely going to be merged into blender2.8 branch soon so I rather avoid any OpenGL code that might need to be rewritten later.

Cleanup: Comments

dynamic fracture, attempt to better control the higher level fractures via threshold

partial fix for dynamic fracture transform issues, impact points might be calculated incorrectly still.

dynamic fracture, fix for texture propagation and autohide on secondary fractures

Curves: Fillet and chamfer operator

Refactored the fillet and chamfer operators. Fixed user interaction for MOUSEMOVE event for fillet operator. Numinput still needs to be checked.

better path parsing for python io calls

Merge branch 'master' into soc-2016-multiview

Remove DNA_manipulator_types.h for now

At least for initial merge we don't need anything in DNA (and I'm not sure how DNA structs are handled which are not explicitely saved to disk... does it still store some info about it?).

Fix selected manipulators only drawn while hovering

Fix a few memory leaks due to double allocation

small clean up. removed 'phi reset' which caused the mesh flickering

Merge remote-tracking branch 'origin/master' into soc-2016-uv_tools