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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-03-05 12:29:02 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-03-05 12:29:02 +0400
commit6ddb1faca976744c2c714c242d781cd42a226ef0 (patch)
treef08cdf79348cf68b6fe1230d3841209b3cf70e20
parent905dda8527e25449f5510bc048f74201ab93729e (diff)
Fix T38962: Boolean modifier crashes when only right operand has UV layer
-rw-r--r--source/blender/modifiers/intern/MOD_boolean_util.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean_util.c b/source/blender/modifiers/intern/MOD_boolean_util.c
index 50ea8f18d3a..e0f8a18d54a 100644
--- a/source/blender/modifiers/intern/MOD_boolean_util.c
+++ b/source/blender/modifiers/intern/MOD_boolean_util.c
@@ -351,6 +351,11 @@ static void exporter_InitGeomArrays(ExportMeshData *export_data,
allocate_custom_layers(&dm->loopData, CD_MLOOPUV, num_loops,
CustomData_number_of_layers(&dm_left->loopData, CD_MLOOPUV));
+ allocate_custom_layers(&dm->loopData, CD_MLOOPCOL, num_loops,
+ CustomData_number_of_layers(&dm_right->loopData, CD_MLOOPCOL));
+ allocate_custom_layers(&dm->loopData, CD_MLOOPUV, num_loops,
+ CustomData_number_of_layers(&dm_right->loopData, CD_MLOOPUV));
+
/* Merge custom data layers from operands.
*
* Will only create custom data layers for all the layers which appears in