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)
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

1  2 
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