Commit: 76a9d1984fc300899e06a6b5c304fcd9d3282f3d
Author: Bastien Montagne
Date: Mon Feb 25 16:40:21 2019 +0100
Branches: master
https://developer.blender.org/rB76a9d1984fc300899e06a6b5c304fcd9d3282f3d
Fix (unreported) broken code in RNA's datatransfer source layer enum function.
Using a CDLayer data type instead of expected mask... tsst... ;)
===================================================================
M source/blender/makesrna/intern/rna_modifier.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_modifier.c
b/source/blender/makesrna/intern/rna_modifier.c
index d2822438a39..121733671f7 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -937,7 +937,7 @@ static const EnumPropertyItem
*rna_DataTransferModifier_layers_select_src_itemf(
Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
Object *ob_src_eval =
DEG_get_evaluated_object(depsgraph, ob_src);
- me_eval = mesh_get_eval_final(depsgraph, scene_eval,
ob_src_eval, CD_MASK_BAREMESH | CD_MLOOPUV);
+ me_eval = mesh_get_eval_final(depsgraph, scene_eval,
ob_src_eval, CD_MASK_BAREMESH | CD_MASK_MLOOPUV);
num_data = CustomData_number_of_layers(&me_eval->ldata,
CD_MLOOPUV);
RNA_enum_item_add_separator(&item, &totitem);
@@ -959,7 +959,7 @@ static const EnumPropertyItem
*rna_DataTransferModifier_layers_select_src_itemf(
Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
Object *ob_src_eval =
DEG_get_evaluated_object(depsgraph, ob_src);
- me_eval = mesh_get_eval_final(depsgraph, scene_eval,
ob_src_eval, CD_MASK_BAREMESH | CD_MLOOPCOL);
+ me_eval = mesh_get_eval_final(depsgraph, scene_eval,
ob_src_eval, CD_MASK_BAREMESH | CD_MASK_MLOOPCOL);
num_data = CustomData_number_of_layers(&me_eval->ldata,
CD_MLOOPCOL);
RNA_enum_item_add_separator(&item, &totitem);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
