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:
authorCampbell Barton <ideasman42@gmail.com>2018-07-06 11:10:47 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-07-06 11:10:47 +0300
commitaff8b0239427a48707a17e347ca681c9a37dc32e (patch)
tree59acdd0cfb8d5157ee4bcfe9775522c5b031d0c4 /source/blender/blenkernel
parented2204933ad2a8f5b012ebc457c2e2576b006cac (diff)
parent62fbb7d4a10bea1ce88a486657a87743b93c9fd1 (diff)
Merge branch 'master' into 28
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/object.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 61d38a4e937..0418634c704 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -719,6 +719,9 @@ void BKE_object_init(Object *ob)
ob->dt = OB_TEXTURE;
ob->empty_drawtype = OB_PLAINAXES;
ob->empty_drawsize = 1.0;
+ if (ob->type == OB_EMPTY) {
+ copy_v2_fl(ob->ima_ofs, -0.5f);
+ }
if (ELEM(ob->type, OB_LAMP, OB_CAMERA, OB_SPEAKER)) {
ob->trackflag = OB_NEGZ;