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:
authorCampbell Barton <ideasman42@gmail.com>2015-04-20 21:45:26 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-04-20 21:50:39 +0300
commit62e149881a311e2f2b41131eb201d86a59031c77 (patch)
treedb6a018a720a99009420038d2d2b08da0fc4ce27 /source/blender/editors/include
parentaa880bb815e7707255f7d450f4add1b042f119fa (diff)
Fixes for backbuf selection logic
- Fix ED_view3d_backbuf_sample_rect, r_dist was set completely wrong. - Avoid duplicate calculations picking the nearest edge. - Bias against picking selected edges is now optional. - Remove unused callback reading the backbuf. - Remove unused strict option picking vertices.
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r--source/blender/editors/include/ED_mesh.h5
-rw-r--r--source/blender/editors/include/ED_view3d.h3
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index 91b05cdc1ba..3c672362a54 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -139,10 +139,13 @@ bool EDBM_backbuf_circle_init(struct ViewContext *vc, short xs, short ys, short
struct BMVert *EDBM_vert_find_nearest_ex(
struct ViewContext *vc, float *r_dist,
- const bool use_select_bias, const bool is_strict);
+ const bool use_select_bias);
struct BMVert *EDBM_vert_find_nearest(
struct ViewContext *vc, float *r_dist);
+struct BMEdge *EDBM_edge_find_nearest_ex(
+ struct ViewContext *vc, float *r_dist,
+ const bool use_select_bias);
struct BMEdge *EDBM_edge_find_nearest(
struct ViewContext *vc, float *r_dist);
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index f68b52d9a6e..6be7f706f28 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -271,8 +271,7 @@ void ED_view3d_backbuf_validate(struct ViewContext *vc);
struct ImBuf *ED_view3d_backbuf_read(struct ViewContext *vc, short xmin, short ymin, short xmax, short ymax);
unsigned int ED_view3d_backbuf_sample_rect(
struct ViewContext *vc, const int mval[2], int size,
- unsigned int min, unsigned int max, float *dist, const bool is_strict,
- void *handle, bool (*indextest)(void *handle, unsigned int index));
+ unsigned int min, unsigned int max, float *dist);
int ED_view3d_backbuf_sample_size_clamp(struct ARegion *ar, const float dist);
unsigned int ED_view3d_backbuf_sample(struct ViewContext *vc, int x, int y);