diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-16 20:14:24 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-16 20:14:24 +0300 |
| commit | ddbbd9928ec443f813ee4d46011288e360278e9f (patch) | |
| tree | 91f50fc6e8e8b68be5686903aca191d43cdafae5 /source/blender/editors/space_view3d/view3d_camera_control.c | |
| parent | b86be9b2145458037fd0b17433b7af0efa7b6472 (diff) | |
| parent | d2ef342b2a50a7eac725889708fd689ffa126e25 (diff) | |
Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_camera_control.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_camera_control.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_camera_control.c b/source/blender/editors/space_view3d/view3d_camera_control.c index 260546738f4..d812ed530ce 100644 --- a/source/blender/editors/space_view3d/view3d_camera_control.c +++ b/source/blender/editors/space_view3d/view3d_camera_control.c @@ -101,7 +101,7 @@ typedef struct View3DCameraControl { void *obtfm; } View3DCameraControl; -BLI_INLINE Object *view3d_cameracontrol_object(View3DCameraControl *vctrl) +BLI_INLINE Object *view3d_cameracontrol_object(const View3DCameraControl *vctrl) { return vctrl->root_parent ? vctrl->root_parent : vctrl->ctx_v3d->camera; } |