Commit: 15676bcc85d8ef4c4083643e3ff8b13661de52de
Author: Campbell Barton
Date: Mon Jul 27 21:10:04 2015 +1000
Branches: master
https://developer.blender.org/rB15676bcc85d8ef4c4083643e3ff8b13661de52de
Error in looptri update, was checking wrong layer-type
===================================================================
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c
b/source/blender/blenkernel/intern/DerivedMesh.c
index 2b4a0f4..dd29a8a 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1602,7 +1602,7 @@ static void dm_ensure_display_normals(DerivedMesh *dm)
/* BLI_assert((CustomData_has_layer(&dm->polyData, CD_NORMAL) ==
false)); */
if ((dm->type == DM_TYPE_CDDM) &&
- ((dm->dirty & DM_DIRTY_NORMALS) ||
CustomData_has_layer(&dm->faceData, CD_NORMAL) == false))
+ ((dm->dirty & DM_DIRTY_NORMALS) ||
CustomData_has_layer(&dm->polyData, CD_NORMAL) == false))
{
/* if normals are dirty we want to calculate vertex normals too
*/
CDDM_calc_normals_mapping_ex(dm, (dm->dirty & DM_DIRTY_NORMALS)
? false : true);
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c
b/source/blender/blenkernel/intern/dynamicpaint.c
index 625675a..880241a 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -1562,7 +1562,6 @@ static void dynamicPaint_setInitialColor(const Scene
*scene, DynamicPaintSurface
const MLoopTri *mlooptri = dm->getLoopTriArray(dm);
ImgSeqFormatData *f_data = (ImgSeqFormatData
*)sData->format_data;
int samples = (surface->flags & MOD_DPAINT_ANTIALIAS) ?
5 : 1;
- // should this be replaced by CD_MLOOPCOL?
MLoopCol *col =
CustomData_get_layer_named(&dm->loopData, CD_MLOOPCOL, surface->init_layername);
if (!col) return;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
