[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23401] trunk/blender/source/blender/ editors/uvedit/uvedit_ops.c: Fix #19382: crash on uv edit stitch, tweaking limit property in tool area.
Brecht Van Lommel
brecht at blender.org
Mon Sep 21 18:08:38 CEST 2009
Revision: 23401
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23401
Author: blendix
Date: 2009-09-21 18:08:38 +0200 (Mon, 21 Sep 2009)
Log Message:
-----------
Fix #19382: crash on uv edit stitch, tweaking limit property in tool area.
Modified Paths:
--------------
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2009-09-21 16:01:31 UTC (rev 23400)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2009-09-21 16:08:38 UTC (rev 23401)
@@ -180,7 +180,13 @@
{
int width, height;
- ED_space_image_size(sima, &width, &height);
+ if(sima) {
+ ED_space_image_size(sima, &width, &height);
+ }
+ else {
+ width= 256;
+ height= 256;
+ }
dist[0]= pixeldist/width;
dist[1]= pixeldist/height;
@@ -1097,11 +1103,11 @@
if(RNA_boolean_get(op->ptr, "use_limit")) {
UvVertMap *vmap;
UvMapVert *vlist, *iterv;
- float newuv[2], limit[2], pixels;
+ float newuv[2], limit[2];
int a, vtot;
- pixels= RNA_float_get(op->ptr, "limit");
- uvedit_pixel_to_float(sima, limit, pixels);
+ limit[0]= RNA_float_get(op->ptr, "limit");
+ limit[1]= limit[0];
EM_init_index_arrays(em, 0, 0, 1);
vmap= EM_make_uv_vert_map(em, 1, 0, limit);
@@ -1255,7 +1261,7 @@
/* properties */
RNA_def_boolean(ot->srna, "use_limit", 1, "Use Limit", "Stitch UVs within a specified limit distance.");
- RNA_def_float(ot->srna, "limit", 20.0, 0.0f, FLT_MAX, "Limit", "Limit distance in image pixels.", -FLT_MAX, FLT_MAX);
+ RNA_def_float(ot->srna, "limit", 0.01f, 0.0f, FLT_MAX, "Limit", "Limit distance in normalized coordinates.", -FLT_MAX, FLT_MAX);
}
/* ******************** (de)select all operator **************** */
@@ -1439,7 +1445,7 @@
else {
sync= 0;
selectmode= ts->uv_selectmode;
- sticky= sima ? sima->sticky : 1;
+ sticky= (sima)? sima->sticky: 1;
}
/* find nearest element */
More information about the Bf-blender-cvs
mailing list