Cleanup: clang-format, use static sets, sort struct declarations
This commit is contained in:
parent
d3b1cce400
commit
37821143dd
|
@ -823,7 +823,7 @@ class VIEW3D_MT_editor_menus(Menu):
|
|||
layout.menu("VIEW3D_MT_select_paint_mask")
|
||||
elif mesh.use_paint_mask_vertex and mode_string in {'PAINT_WEIGHT', 'PAINT_VERTEX'}:
|
||||
layout.menu("VIEW3D_MT_select_paint_mask_vertex")
|
||||
elif mode_string not in ('SCULPT', 'SCULPT_CURVES'):
|
||||
elif mode_string not in {'SCULPT', 'SCULPT_CURVES'}:
|
||||
layout.menu("VIEW3D_MT_select_%s" % mode_string.lower())
|
||||
|
||||
if gp_edit:
|
||||
|
@ -866,7 +866,7 @@ class VIEW3D_MT_editor_menus(Menu):
|
|||
layout.menu("VIEW3D_MT_edit_curve_segments")
|
||||
|
||||
elif obj:
|
||||
if mode_string not in ('PAINT_TEXTURE', 'SCULPT_CURVES'):
|
||||
if mode_string not in {'PAINT_TEXTURE', 'SCULPT_CURVES'}:
|
||||
layout.menu("VIEW3D_MT_%s" % mode_string.lower())
|
||||
if mode_string == 'SCULPT':
|
||||
layout.menu("VIEW3D_MT_mask")
|
||||
|
|
|
@ -88,7 +88,8 @@ struct KS_Path *BKE_keyingset_find_path(struct KeyingSet *ks,
|
|||
void BKE_keyingsets_copy(struct ListBase *newlist, const struct ListBase *list);
|
||||
|
||||
/** Process the ID pointers inside a scene's keyingsets, in see `BKE_lib_query.h` for details. */
|
||||
void BKE_keyingsets_foreach_id(struct LibraryForeachIDData *data, const struct ListBase *keyingsets);
|
||||
void BKE_keyingsets_foreach_id(struct LibraryForeachIDData *data,
|
||||
const struct ListBase *keyingsets);
|
||||
|
||||
/* Free the given Keying Set path */
|
||||
void BKE_keyingset_free_path(struct KeyingSet *ks, struct KS_Path *ksp);
|
||||
|
|
|
@ -12,9 +12,9 @@ extern "C" {
|
|||
#endif
|
||||
|
||||
struct BoundBox;
|
||||
struct Curves;
|
||||
struct CustomDataLayer;
|
||||
struct Depsgraph;
|
||||
struct Curves;
|
||||
struct Main;
|
||||
struct Object;
|
||||
struct Scene;
|
||||
|
|
|
@ -16,6 +16,7 @@ struct Brush;
|
|||
struct CurveMapping;
|
||||
struct Depsgraph;
|
||||
struct GHash;
|
||||
struct GPencilUpdateCache;
|
||||
struct ListBase;
|
||||
struct MDeformVert;
|
||||
struct Main;
|
||||
|
@ -32,7 +33,6 @@ struct bGPDlayer;
|
|||
struct bGPDlayer_Mask;
|
||||
struct bGPDstroke;
|
||||
struct bGPdata;
|
||||
struct GPencilUpdateCache;
|
||||
|
||||
#define GPENCIL_SIMPLIFY(scene) (scene->r.simplify_gpencil & SIMPLIFY_GPENCIL_ENABLE)
|
||||
#define GPENCIL_SIMPLIFY_ONPLAY(playing) \
|
||||
|
|
|
@ -14,11 +14,11 @@ extern "C" {
|
|||
#include "BLI_sys_types.h" /* for bool */
|
||||
|
||||
struct DLRBT_Tree;
|
||||
struct bGPdata;
|
||||
struct bGPDlayer;
|
||||
struct bGPDframe;
|
||||
struct bGPDstroke;
|
||||
struct GPencilUpdateCache;
|
||||
struct bGPDframe;
|
||||
struct bGPDlayer;
|
||||
struct bGPDstroke;
|
||||
struct bGPdata;
|
||||
|
||||
/* GPencilUpdateCache.flag */
|
||||
typedef enum eGPUpdateCacheNodeFlag {
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
#include "DNA_image_types.h"
|
||||
|
||||
extern "C" {
|
||||
struct PartialUpdateUser;
|
||||
struct PartialUpdateRegister;
|
||||
struct PartialUpdateUser;
|
||||
}
|
||||
|
||||
namespace blender::bke::image {
|
||||
|
|
|
@ -7,12 +7,12 @@
|
|||
*/
|
||||
|
||||
struct ID;
|
||||
struct ImageUser;
|
||||
struct Main;
|
||||
struct bNode;
|
||||
struct bNodeLink;
|
||||
struct bNodeSocket;
|
||||
struct bNodeTree;
|
||||
struct ImageUser;
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -90,8 +90,8 @@ static int chunk_number_for_pixel(int pixel_offset)
|
|||
return chunk_offset;
|
||||
}
|
||||
|
||||
struct PartialUpdateUserImpl;
|
||||
struct PartialUpdateRegisterImpl;
|
||||
struct PartialUpdateUserImpl;
|
||||
|
||||
/**
|
||||
* Wrap PartialUpdateUserImpl to its C-struct (PartialUpdateUser).
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
#include "DNA_mesh_types.h"
|
||||
#include "DNA_meshdata_types.h"
|
||||
#include "DNA_object_types.h"
|
||||
|
||||
#include "BLI_map.hh"
|
||||
#include "BLI_task.hh"
|
||||
#include "BLI_threads.h"
|
||||
|
|
|
@ -15,9 +15,9 @@ extern "C" {
|
|||
#endif
|
||||
|
||||
struct GPUBatch;
|
||||
struct IDRemapper;
|
||||
struct Main;
|
||||
struct bContext;
|
||||
struct IDRemapper;
|
||||
|
||||
/* ed_util.c */
|
||||
|
||||
|
|
|
@ -14,15 +14,15 @@
|
|||
#define V3D_OP_TRACKBALLSIZE (1.1f)
|
||||
|
||||
struct ARegion;
|
||||
struct bContext;
|
||||
struct Depsgraph;
|
||||
struct Dial;
|
||||
struct Main;
|
||||
struct rcti;
|
||||
struct RegionView3D;
|
||||
struct Scene;
|
||||
struct ScrArea;
|
||||
struct View3D;
|
||||
struct bContext;
|
||||
struct rcti;
|
||||
struct wmEvent;
|
||||
struct wmOperator;
|
||||
|
||||
|
|
|
@ -8,10 +8,10 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
struct bNode;
|
||||
struct bNodeTree;
|
||||
struct Material;
|
||||
struct USDExportParams;
|
||||
struct bNode;
|
||||
struct bNodeTree;
|
||||
|
||||
namespace blender::io::usd {
|
||||
|
||||
|
|
|
@ -18,8 +18,8 @@ extern "C" {
|
|||
struct AnimData;
|
||||
struct Curve;
|
||||
struct Curve;
|
||||
struct MDeformVert;
|
||||
struct GPencilUpdateCache;
|
||||
struct MDeformVert;
|
||||
|
||||
#define GP_DEFAULT_PIX_FACTOR 1.0f
|
||||
#define GP_DEFAULT_GRID_LINES 4
|
||||
|
|
|
@ -11,11 +11,11 @@
|
|||
#include "DNA_listBase.h"
|
||||
#include "DNA_vec_types.h"
|
||||
|
||||
struct ImBuf;
|
||||
struct Image;
|
||||
struct ImageFormatData;
|
||||
struct Main;
|
||||
struct Object;
|
||||
struct ImBuf;
|
||||
struct RenderData;
|
||||
struct RenderResult;
|
||||
struct ReportList;
|
||||
|
|
Loading…
Reference in New Issue