Merge branch 'master' into blender2.8
This commit is contained in:
commit
ea6fef9385
|
@ -119,9 +119,9 @@ set(SRC
|
|||
intern/bmesh_polygon_edgenet.c
|
||||
intern/bmesh_polygon_edgenet.h
|
||||
intern/bmesh_private.h
|
||||
intern/bmesh_queries.c
|
||||
intern/bmesh_queries.h
|
||||
intern/bmesh_queries_inline.h
|
||||
intern/bmesh_query.c
|
||||
intern/bmesh_query.h
|
||||
intern/bmesh_query_inline.h
|
||||
intern/bmesh_structure.c
|
||||
intern/bmesh_structure.h
|
||||
intern/bmesh_structure_inline.h
|
||||
|
|
|
@ -98,7 +98,7 @@
|
|||
*
|
||||
* These are accessible through the iterator api, which is covered later in this document
|
||||
*
|
||||
* See source/blender/bmesh/bmesh_queries.h for more misc. queries.
|
||||
* See source/blender/bmesh/bmesh_query.h for more misc. queries.
|
||||
*
|
||||
*
|
||||
* \section bm_api The BMesh API
|
||||
|
@ -246,7 +246,7 @@ extern "C" {
|
|||
#include "intern/bmesh_operators.h"
|
||||
#include "intern/bmesh_polygon.h"
|
||||
#include "intern/bmesh_polygon_edgenet.h"
|
||||
#include "intern/bmesh_queries.h"
|
||||
#include "intern/bmesh_query.h"
|
||||
#include "intern/bmesh_walkers.h"
|
||||
|
||||
#include "intern/bmesh_inline.h"
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
/** \file blender/bmesh/intern/bmesh_queries.c
|
||||
/** \file blender/bmesh/intern/bmesh_query.c
|
||||
* \ingroup bmesh
|
||||
*
|
||||
* This file contains functions for answering common
|
|
@ -23,7 +23,7 @@
|
|||
#ifndef __BMESH_QUERIES_H__
|
||||
#define __BMESH_QUERIES_H__
|
||||
|
||||
/** \file blender/bmesh/intern/bmesh_queries.h
|
||||
/** \file blender/bmesh/intern/bmesh_query.h
|
||||
* \ingroup bmesh
|
||||
*/
|
||||
|
||||
|
@ -196,6 +196,6 @@ int BM_mesh_calc_edge_groups(
|
|||
/* not really any good place to put this */
|
||||
float bmesh_subd_falloff_calc(const int falloff, float val) ATTR_WARN_UNUSED_RESULT;
|
||||
|
||||
#include "bmesh_queries_inline.h"
|
||||
#include "bmesh_query_inline.h"
|
||||
|
||||
#endif /* __BMESH_QUERIES_H__ */
|
|
@ -18,7 +18,7 @@
|
|||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
/** \file blender/bmesh/intern/bmesh_queries_inline.h
|
||||
/** \file blender/bmesh/intern/bmesh_query_inline.h
|
||||
* \ingroup bmesh
|
||||
*/
|
||||
|
|
@ -8816,7 +8816,7 @@ static void applyTimeScale(TransInfo *t, const int UNUSED(mval[2]))
|
|||
/** \} */
|
||||
|
||||
|
||||
/* TODO, move to: transform_queries.c */
|
||||
/* TODO, move to: transform_query.c */
|
||||
bool checkUseAxisMatrix(TransInfo *t)
|
||||
{
|
||||
/* currently only checks for editmode */
|
||||
|
|
|
@ -886,7 +886,7 @@ void freeVertSlideVerts(TransInfo *t, TransDataContainer *tc, TransCustomData *c
|
|||
void projectVertSlideData(TransInfo *t, bool is_final);
|
||||
|
||||
|
||||
/* TODO. transform_queries.c */
|
||||
/* TODO. transform_query.c */
|
||||
bool checkUseAxisMatrix(TransInfo *t);
|
||||
|
||||
#define TRANSFORM_SNAP_MAX_PX 100.0f
|
||||
|
|
Loading…
Reference in New Issue