[Bf-blender-cvs] [50a19cc] master: Fix T47317: Dynamic paint crashes with no UV layer

[Campbell Barton]

Commit: 50a19cc8524b1bb81e71e69595d737a93511b3bc
Author: Campbell Barton
Date:   Thu Feb 4 14:17:52 2016 +1100
Branches: master
https://developer.blender.org/rB50a19cc8524b1bb81e71e69595d737a93511b3bc

Fix T47317: Dynamic paint crashes with no UV layer

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

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

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

diff --git a/source/blender/blenkernel/intern/dynamicpaint.c 
b/source/blender/blenkernel/intern/dynamicpaint.c
index 6c8eae6..dbf095d 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -2189,8 +2189,10 @@ int dynamicPaint_createUVSurface(Scene *scene, 
DynamicPaintSurface *surface)
        tottri = dm->getNumLoopTri(dm);
 
        /* get uv map */
-       CustomData_validate_layer_name(&dm->loopData, CD_MLOOPUV, 
surface->uvlayer_name, uvname);
-       mloopuv = CustomData_get_layer_named(&dm->loopData, CD_MLOOPUV, uvname);
+       if (CustomData_has_layer(&dm->loopData, CD_MLOOPUV)) {
+               CustomData_validate_layer_name(&dm->loopData, CD_MLOOPUV, 
surface->uvlayer_name, uvname);
+               mloopuv = CustomData_get_layer_named(&dm->loopData, CD_MLOOPUV, 
uvname);
+       }
 
        /* Check for validity   */
        if (!mloopuv)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs