diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-04-27 05:49:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-04-27 06:12:55 +0300 |
| commit | 9bd51735a10280af3cf56edf3698961a1e230d4d (patch) | |
| tree | 83a7ce455b4e737afed43e072552db35b5879716 | |
| parent | c2cdc673758039653db3d2035704858406e7b4ea (diff) | |
Cleanup: use const, duplicate header
| -rw-r--r-- | source/blender/blenkernel/BKE_mask.h | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mask.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mask/mask_add.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_snap_object.c | 6 |
4 files changed, 6 insertions, 10 deletions
diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h index 2f85db4d5d2..25893d54dca 100644 --- a/source/blender/blenkernel/BKE_mask.h +++ b/source/blender/blenkernel/BKE_mask.h @@ -61,8 +61,10 @@ typedef enum { MASK_HANDLE_MODE_INDIVIDUAL_HANDLES = 2, } eMaskhandleMode; -struct MaskSplinePoint *BKE_mask_spline_point_array(struct MaskSpline *spline); -struct MaskSplinePoint *BKE_mask_spline_point_array_from_point(struct MaskSpline *spline, struct MaskSplinePoint *point_ref); +struct MaskSplinePoint *BKE_mask_spline_point_array( + struct MaskSpline *spline); +struct MaskSplinePoint *BKE_mask_spline_point_array_from_point( + struct MaskSpline *spline, const struct MaskSplinePoint *point_ref); /* mask layers */ struct MaskLayer *BKE_mask_layer_new(struct Mask *mask, const char *name); diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index 12db3a87ba0..930a3c487ec 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -116,7 +116,7 @@ MaskSplinePoint *BKE_mask_spline_point_array(MaskSpline *spline) return spline->points_deform ? spline->points_deform : spline->points; } -MaskSplinePoint *BKE_mask_spline_point_array_from_point(MaskSpline *spline, MaskSplinePoint *point_ref) +MaskSplinePoint *BKE_mask_spline_point_array_from_point(MaskSpline *spline, const MaskSplinePoint *point_ref) { if ((point_ref >= spline->points) && (point_ref < &spline->points[spline->tot_point])) { return spline->points; diff --git a/source/blender/editors/mask/mask_add.c b/source/blender/editors/mask/mask_add.c index 822bb429f9e..3730cff731c 100644 --- a/source/blender/editors/mask/mask_add.c +++ b/source/blender/editors/mask/mask_add.c @@ -196,7 +196,7 @@ bool ED_mask_find_nearest_diff_point(const bContext *C, static void setup_vertex_point(Mask *mask, MaskSpline *spline, MaskSplinePoint *new_point, const float point_co[2], const float u, - MaskSplinePoint *reference_point, const bool reference_adjacent) + const MaskSplinePoint *reference_point, const bool reference_adjacent) { MaskSplinePoint *prev_point = NULL; MaskSplinePoint *next_point = NULL; diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 484307d12e2..62c0128036a 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -29,9 +29,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" -#include "DNA_scene_types.h" - #include "BLI_math.h" #include "BLI_kdopbvh.h" #include "BLI_memarena.h" @@ -56,9 +53,6 @@ #include "ED_transform.h" #include "ED_view3d.h" #include "ED_armature.h" -#include "ED_view3d.h" - -#include "MEM_guardedalloc.h" #include "transform.h" |