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:
authorJulian Eisel <julian@blender.org>2020-03-17 22:20:22 +0300
committerJulian Eisel <julian@blender.org>2020-03-17 22:20:22 +0300
commita640587e25e43be8007fa0090a59fd9bb6d51e39 (patch)
treeef780ec436232535a9e36ac233de1792ee8ba9e4 /source/blender/makesdna/DNA_view3d_types.h
parent99eb95337f74f1a303c774902ea29f7d378bac1b (diff)
parent892637f60afbbb787334caa26f5342baf1d4a7d7 (diff)
Merge branch 'temp-openxr-blenderside' into soc-2019-openxrsoc-2019-openxr
Diffstat (limited to 'source/blender/makesdna/DNA_view3d_types.h')
-rw-r--r--source/blender/makesdna/DNA_view3d_types.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index edc86a4b0ea..a25d66cbc9b 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -265,14 +265,14 @@ typedef struct View3D {
short persp DNA_DEPRECATED;
short view DNA_DEPRECATED;
- struct Object *camera, *ob_centre;
+ struct Object *camera, *ob_center;
rctf render_border;
/** Allocated backup of its self while in localview. */
struct View3D *localvd;
/** Optional string for armature bone to define center, MAXBONENAME. */
- char ob_centre_bone[64];
+ char ob_center_bone[64];
unsigned short local_view_uuid;
char _pad6[2];
@@ -281,7 +281,7 @@ typedef struct View3D {
short _pad7[3];
/** Optional bool for 3d cursor to define center. */
- short ob_centre_cursor;
+ short ob_center_cursor;
short scenelock;
short gp_flag;
short flag;