Merge branch 'master' into soc-2013-depsgraph_mt soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 27 Dec 2013 11:05:49 +0000 (17:05 +0600)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 27 Dec 2013 11:05:49 +0000 (17:05 +0600)
commit76b562237f31a804cd2eba9e3af6effa54f31b5b
treed789e373995ad0ab4ca0fb5668937c5b7814bb2d
parent03e388127034c35c82ed0f84b2239125111db5a4
parentd09a8ea9e7a8ad208326b99a0631e9efc7119fbd
Merge branch 'master' into soc-2013-depsgraph_mt

Conflicts:
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/collada/AnimationExporter.cpp
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_util.c
source/blender/render/intern/source/pipeline.c
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/blender/modifiers/intern/MOD_util.c
source/blender/render/intern/source/pipeline.c