blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Merge branch 'master' of git@git.blender.org:blender.git into blender2.8

This commit is contained in:
Germano Cavalcante 2017-07-11 14:24:32 -03:00
parent 538475dec7 b3f62b68a9
commit 593b80143b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/transform/transform_snap_object.c
View File

@ -793,7 +793,7 @@ static bool raycastObj(
}
else {
/* in this case we want the mesh from the editmesh, avoids stale data. see: T45978.
* still set the 'em' to NULL, since we only want the 'dm'. */
* still set the 'em' to NULL, since we only want the 'dm'. */
DerivedMesh *dm;
em = BKE_editmesh_from_object(ob);
if (em) {
@ -827,13 +827,13 @@ static bool raycastObj(
* Main RayCast Function
* ======================
*
* Walks through all objects in the scene to find the ´hit´ on object surface.
* Walks through all objects in the scene to find the `hit` on object surface.
*
* \param sctx: Snap context to store data.
* \param snapdata: struct generated in `get_snapdata`.
* \param snapdata: struct generated in `set_snapdata`.
* \param snap_select : from enum SnapSelect.
* \param use_object_edit_cage : Uses the coordinates of BMesh(if any) to do the snapping.
* \param obj_list: List with objects to snap (created in ´create_object_list´).
* \param obj_list: List with objects to snap (created in `create_object_list`).
*
* Read/Write Args
* ---------------