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:
authorHans Goudey <h.goudey@me.com>2022-04-06 00:13:55 +0300
committerHans Goudey <h.goudey@me.com>2022-04-06 00:13:55 +0300
commit7a5e663843786f7a2d051e06de9586cca7ed5c39 (patch)
tree1c3bdbe709fbe3147a98ce60268ca69680784b02
parent7455bb85cc7c0deea31c79186be23137005bbe33 (diff)
Fix: Pass const arguments to object snapping
-rw-r--r--source/blender/editors/transform/transform_snap_object.cc15
1 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/editors/transform/transform_snap_object.cc b/source/blender/editors/transform/transform_snap_object.cc
index e879ca2b163..c9980bc5671 100644
--- a/source/blender/editors/transform/transform_snap_object.cc
+++ b/source/blender/editors/transform/transform_snap_object.cc
@@ -8,10 +8,12 @@
#include "MEM_guardedalloc.h"
+#include "BLI_float4x4.hh"
#include "BLI_ghash.h"
#include "BLI_kdopbvh.h"
#include "BLI_listbase.h"
#include "BLI_math.h"
+#include "BLI_math_vector.hh"
#include "BLI_memarena.h"
#include "BLI_utildefines.h"
@@ -43,6 +45,9 @@
#include "ED_transform_snap_object_context.h"
#include "ED_view3d.h"
+using blender::float3;
+using blender::float4x4;
+
/* -------------------------------------------------------------------- */
/** \name Internal Data Types
* \{ */
@@ -441,7 +446,7 @@ static SnapObjectData *snap_object_data_editmesh_get(SnapObjectContext *sctx,
using IterSnapObjsCallback = void (*)(SnapObjectContext *sctx,
const struct SnapObjectParams *params,
Object *ob_eval,
- float obmat[4][4],
+ const float obmat[4][4],
bool is_object_active,
void *data);
@@ -1018,7 +1023,7 @@ struct RaycastObjUserData {
static void raycast_obj_fn(SnapObjectContext *sctx,
const struct SnapObjectParams *params,
Object *ob_eval,
- float obmat[4][4],
+ const float obmat[4][4],
bool is_object_active,
void *data)
{
@@ -2230,7 +2235,7 @@ static short snap_object_center(const SnapObjectContext *sctx,
static short snapCamera(const SnapObjectContext *sctx,
Object *object,
- float obmat[4][4],
+ const float obmat[4][4],
/* read/write args */
float *dist_px,
/* return args */
@@ -2271,7 +2276,7 @@ static short snapCamera(const SnapObjectContext *sctx,
LISTBASE_FOREACH (MovieTrackingObject *, tracking_object, &tracking->objects) {
ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, tracking_object);
float reconstructed_camera_mat[4][4], reconstructed_camera_imat[4][4];
- float(*vertex_obmat)[4];
+ const float(*vertex_obmat)[4];
if ((tracking_object->flag & TRACKING_OBJECT_CAMERA) == 0) {
BKE_tracking_camera_get_reconstructed_interpolate(
@@ -2730,7 +2735,7 @@ struct SnapObjUserData {
static void snap_obj_fn(SnapObjectContext *sctx,
const struct SnapObjectParams *params,
Object *ob_eval,
- float obmat[4][4],
+ const float obmat[4][4],
bool is_object_active,
void *data)
{