Blender Git Loki

More work on particle conversion methods for hair edit mode.

New editor library for hair edit mode.

Merge branch 'master' into gooseberry

Conflicts:
release/scripts/startup/bl_ui/space_sequencer.py
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/sound.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_ops.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_intern.h
source/blender/editors/space_sequencer/sequencer_preview.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_ops.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_snap.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesrna/intern/rna_space.c

Islands 'TubeCase' WIP: create AStar graph from islands.

First step of actual implementation.

Merge branch 'master' into mesh-transfer-data

Islands 'TubeCase' WIP: implementation of AStar path algo.

Theoritical code for now, not linked to anything yet.

Merge remote-tracking branch 'origin/master' into ime

Conflicts:
source/blender/editors/space_node/node_add.c
source/blender/editors/space_text/text_draw.c
source/blender/editors/space_view3d/view3d_edit.c

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_ops.c

rename "Initial Particle Coordinates" to "Particle Birth Coordinates"

cleanup & use STREQ macro

cluster breaking angle, distance, percentage added, rename contact distance to search radius, jump back to start frame of rigidbody cache now automatically at fracture time (or frame 1)

Merge branch 'gooseberry' into hair_system

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

From review: small changes

* Remove double promotion as suggested on review
* Remove extra space and lines in python file
* Undo unecessary change in BKE_camera_object_dof_distance
* Rename stereo_3d operator to set_stereo_3d
* Remove unused variable in python
* Remove unecessary include

Merge branch 'master' into depsgraph_refactor

cleanup: use empty checks instead of counting

picky - naming, arrays were named same as single vars

Fixing build with OPENEXR disabled

picky - naming

fix for building with glew-mx

(dont include GL/glew.h direct anymore)

minor edits to last commit