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:
authorAntony Riakiotakis <kalast@gmail.com>2014-06-18 19:20:55 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-06-18 19:20:55 +0400
commitd9de1b367e8e6d48556c2cd1621c27275ef07aa9 (patch)
tree837e20725bc87da9eed545c6585fab8d40ce0191 /source/blender/makesrna/intern/rna_scene_api.c
parent0eb060c7b4fb3a85b14c9efca85a7a361640a95e (diff)
Revert "Fix flickering when transform snapping in edit mode and cursor is"
Looks like the cleanest way to handle this is to no do bounding box collision for edit mode at all. But this is easy to enforce This reverts commit 7b5fe4f316234022a0ab761b694cd459ce98db2d. Conflicts: source/blender/editors/transform/transform_snap.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene_api.c')
-rw-r--r--source/blender/makesrna/intern/rna_scene_api.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index c6a8bf5aca4..84134e7cd3a 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -126,7 +126,7 @@ static void rna_Scene_ray_cast(Scene *scene, float ray_start[3], float ray_end[3
if (snapObjectsRayEx(scene, NULL, NULL, NULL, NULL, SCE_SNAP_MODE_FACE,
r_ob, (float(*)[4])r_obmat,
ray_start, ray_nor, &ray_dist,
- NULL, &dummy_dist_px, r_location, r_normal, SNAP_ALL, NULL))
+ NULL, &dummy_dist_px, r_location, r_normal, SNAP_ALL))
{
*r_success = true;
}