Blender Git Commits

Blender now runs without crashing, but still garbage on screen.

previous merge went wrong somehow, several parts of mesh data transfer code were missing

Reorganized RMB menu and new entry "Copy Full Data Path"

D763 ready for testing from the sheepy people.

Merge branch 'master' into depsgraph_refactor

Conflicts:
source/blender/blenkernel/intern/scene.c
source/blender/modifiers/intern/MOD_util.h

Changes to the gpu immediate API to reuse the new vertexstream
abstractions (still does not work)

Merge branch 'alembic' into gooseberry

Clean up: Avoid unused variable warnings.

Added missing stub function when Alembic is disabled.

Merge branch 'alembic' into gooseberry

Merge branch 'cycles_point_density' into gooseberry

Cycles point density: Particle state coordinates are actually in the world space

Code was assuming they're in the object space which caused wrong
texture sampling and translation to the world location.

Override the init function for DupliObjectReader, so Cycles gets the
cache result when constructing render meshes.

Some compilation fixes after merge

Merge branch 'cycles_point_density' into gooseberry

Cycles point density: Fix crash when source object is not set

Merge branch 'master' into temp_viewport_fx_merge

Conflicts:
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/gpu/GPU_extensions.h
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_extensions.c

compile fixes due to merge

Merge remote-tracking branch 'refs/remotes/origin/blender-v2.74-release' into fracture_modifier

Conflicts:
intern/cycles/render/scene.cpp
release/datafiles/blender_icons.svg
release/datafiles/blender_icons16/icon16_mod_data_transfer.dat
release/datafiles/blender_icons32/icon32_mod_data_transfer.dat
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/BKE_data_transfer.h
source/blender/blenkernel/BKE_mesh_remap.h
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/data_transfer.c
source/blender/blenkernel/intern/data_transfer_intern.h
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/mesh_mapping.c
source/blender/blenkernel/intern/mesh_remap.c
source/blender/blenkernel/intern/object.c
source/blender/editors/include/UI_icons.h
source/blender/editors/object/object_data_transfer.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_datatransfer.c
source/blender/modifiers/intern/MOD_util.c

Added writers for DupliCache data to allow truely successive cache
modification.

The bake operator will now generate output based on the 'source_mode'
setting:
* When the source is SCENE it uses the basic object data as stored in
the Object ID datablocks (DerivedMesh, particle hair strands etc.)
* When the source is CACHE it fills a temporary DupliCache with data
from the cache archive (like it would for the display dupli_cache,
but also supporting render data). This dupli cache is carried over
between frames during baking, which allows modifiers to act as
simulations and sequentially advance motion states.

Merge branch 'master' into gooseberry