[Bf-blender-cvs] [181124ad135] blender2.8: Fix compilation error

Sergey Sharybin noreply at git.blender.org
Wed Jan 10 14:15:40 CET 2018


Commit: 181124ad1352b19d82e178f302dd4b5c178e54ce
Author: Sergey Sharybin
Date:   Wed Jan 10 14:15:04 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB181124ad1352b19d82e178f302dd4b5c178e54ce

Fix compilation error

Seems of new padding were added in 2.8 branch.

===================================================================

M	source/blender/makesdna/DNA_userdef_types.h

===================================================================

diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 896ae76a407..89761ee6ced 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -510,7 +510,7 @@ typedef struct UserDef {
 	short tb_leftmouse, tb_rightmouse;
 	struct SolidLight light[3];
 	short manipulator_flag, manipulator_size;
-	int pad3;
+	int pad6;
 	short textimeout, texcollectrate;
 	short wmdrawmethod; /* eWM_DrawMethod */
 	short dragthreshold;



More information about the Bf-blender-cvs mailing list