[Bf-blender-cvs] [db444fc783a] blender2.8: Workaround for weightpoint not working

[Dalai Felinto]

Commit: db444fc783af03de6e4568f8f5d613ba7598f7b4
Author: Dalai Felinto
Date:   Fri Apr 7 18:00:39 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBdb444fc783af03de6e4568f8f5d613ba7598f7b4

Workaround for weightpoint not working

Kudos to Germano Cavalcante for spotting the issue, the real fix is to pass SL to the function though

===================================================================

M	source/blender/blenkernel/intern/DerivedMesh.c

===================================================================

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 97bb38c9b15..40c16f5fbff 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2677,7 +2677,8 @@ static void editbmesh_build_data(Scene *scene, Object *obedit, BMEditMesh *em, C
 
 static CustomDataMask object_get_datamask(const Scene *scene, Object *ob, bool *r_need_mapping)
 {
-	Object *actob = scene->basact ? scene->basact->object : NULL;
+	SceneLayer *sl = scene->render_layers.first; /* XXX TODO pass SceneLayer to this function */
+	Object *actob = sl->basact ? sl->basact->object : NULL;
 	CustomDataMask mask = ob->customdata_mask;
 
 	if (r_need_mapping) {