Merge branch 'master' into temp_remove_particles
authorLukas Tönne <lukas.toenne@gmail.com>
Fri, 15 Apr 2016 15:59:54 +0000 (17:59 +0200)
committerLukas Tönne <lukas.toenne@gmail.com>
Fri, 15 Apr 2016 15:59:54 +0000 (17:59 +0200)
commitfbed29a246ed51023c3303115d060d7a455b4fc2
tree44947031e32ba4549cecc2a4fb3d0a18f65151be
parent987bb50a74132e1f2489083c59daab892f24806f
parent6bc2ba21117a25c8a7100b282cc2377e1adf7075
Merge branch 'master' into temp_remove_particles
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/intern/object_dupli.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_buttons.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_smoke.c
source/blender/makesrna/intern/rna_texture.c