Blender Git Commits

fix for "fix normals", used incorrect float to short and back conversion and ignore global rotation of object in normals rotation now

WIP cage transform.

This also includes code for the node editor but probably
will try a different use case first.

limit autohide to faces with inner material and fix attempt for convert to keyframes bug (messed up object locations / rotations)

Merge branch 'hair_immediate_fixes' into hair_system

Conflicts:
source/blender/blenkernel/BKE_effect.h
source/blender/blenkernel/intern/effect.c

Fixes after latest merge.

Nicer hashing functionality for sim debugging using a variadic macro
to support multiple hash identifiers.

Using explicit hashing functions for every sim debug call defeats the
purpose of having a quick feedback system. Now this can be done simply
by passing an arbitrary number of hash inputs (integers) at the end of
the function calls, which are then combined by a system of variadic
macros (based on the ELEM feature). Up to 8 identifiers are supported
currently, but more could be added easily if needed.

Merge branch 'master' into temp_custom_loop_normals

Merge branch 'master' into mesh-transfer-data

Conflicts:
source/blender/editors/object/object_vgroup.c

"Better" solution to avoid infinite recursion in dependency cycles of DataTransfer modifier cases.

Note, issue here is that in modifier case, we can't be no more sure to actually get required
datalayers from source dm...

Merge branch 'master' into mesh-transfer-data

added ghost objects, they do not collide but can activate animated objects

Merge branch 'master' into gooseberry

Remove 'topochange' from EDBM.

In future, there may be several tools relying on topo hash, each one making
updates to it when it needs. Hence, such thing should absolutely not be held
by mesh data, but (in this case) by Key data.

Also made some reorganization and renaming a bit.

Note: this code compiles, but for now cannot really be tested, since scratch
is not enabled...

Merge branch 'master' into soc-2014-shapekey

Merge branch 'hair_immediate_fixes' into hair_system

Conflicts:
source/blender/physics/BPH_mass_spring.h
source/blender/physics/intern/BPH_mass_spring.cpp

Merge branch 'hair_immediate_fixes' into gooseberry

Conflicts:
release/scripts/startup/bl_ui/properties_particle.py
source/blender/editors/physics/particle_edit.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/physics/intern/BPH_mass_spring.cpp
source/blender/physics/intern/hair_volume.cpp
source/blender/physics/intern/implicit.h
source/blender/physics/intern/implicit_blender.c
source/blender/physics/intern/implicit_eigen.cpp

passing obstacle flags to manta correctly

Merge branch 'master' into hair_immediate_fixes

Conflicts:
source/blender/blenkernel/intern/implicit.c

Merge branch 'master' into soc-2014-shapekey

Merge branch 'master' into gooseberry