diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-31 18:16:27 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-31 18:16:27 +0400 |
| commit | c42d0189e586419269e9004868bec365e1b8396f (patch) | |
| tree | 896796da95b1f292ce36d61e4cf7224230b4f2e3 /source/blender/makesrna | |
| parent | 8f6197bd08955f210653973f313bd4de5026bd91 (diff) | |
resolve glitch in the image space where mask editing and UVs would conflict.
now UV editing overrides mask.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 0fefc4c89fb..5cabc328778 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -126,7 +126,7 @@ Mesh *rna_Object_to_mesh(Object *ob, ReportList *reports, Scene *sce, int apply_ } /* convert object type to mesh */ - BKE_mesh_from_nurbs_displist(tmpobj, &dispbase, uv_from_orco ? &orco_index : NULL); + BKE_mesh_from_nurbs_displist(tmpobj, &dispbase, uv_from_orco ? (int **)&orco_index : NULL); tmpmesh = tmpobj->data; |