[Bf-blender-cvs] [4df5506b22f] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
Nick Wu
noreply at git.blender.org
Thu Sep 6 03:50:59 CEST 2018
Commit: 4df5506b22f90d3ce0b6d3ec7761b289552d9b02
Author: Nick Wu
Date: Thu Sep 6 08:30:31 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB4df5506b22f90d3ce0b6d3ec7761b289552d9b02
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
# Conflicts:
# source/blender/makesdna/DNA_scene_types.h
===================================================================
===================================================================
diff --cc source/blender/makesdna/DNA_scene_types.h
index cc8284aeba8,eb1a17a044c..5c08e082160
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -1548,13 -1486,13 +1548,13 @@@ typedef struct Scene
struct Base *basact DNA_DEPRECATED; /* active base */
void *_pad1;
- View3DCursor cursor; /* 3d cursor location */
+ View3DCursor cursor; /* 3d cursor location */
- unsigned int lay; /* bitflags for layer visibility */
- int layact; /* active layer */
+ unsigned int lay DNA_DEPRECATED; /* bitflags for layer visibility */
+ int layact DNA_DEPRECATED; /* active layer */
unsigned int pad1;
- short flag; /* various settings */
+ short flag; /* various settings */
char use_nodes;
char pad[1];
More information about the Bf-blender-cvs
mailing list