Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-04-07 19:00:39 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-04-07 19:00:54 +0300
commitdb444fc783af03de6e4568f8f5d613ba7598f7b4 (patch)
treebc8f8d7c03f1d020367724571d0accd3598875e9 /source
parent31c272e840af0ae4400ffee87e6ac86076580ee5 (diff)
Workaround for weightpoint not working
Kudos to Germano Cavalcante for spotting the issue, the real fix is to pass SL to the function though
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/DerivedMesh.c3
1 files changed, 2 insertions, 1 deletions
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) {