[Bf-blender-cvs] [de2c47cbf1e] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Nick Wu]

Commit: de2c47cbf1e6a110ada8caedf6fc996cec760e09
Author: Nick Wu
Date:   Tue Sep 4 21:52:48 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBde2c47cbf1e6a110ada8caedf6fc996cec760e09

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

# Conflicts:
#	source/blender/makesdna/DNA_scene_types.h

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



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

diff --cc release/scripts/startup/bl_ui/properties_render.py
index 945ac243540,38b73b0397a..bd9afa60a20
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@@ -315,8 -339,9 +339,9 @@@ class RENDER_PT_output_views(RenderButt
  
  class RENDER_PT_encoding(RenderButtonsPanel, Panel):
      bl_label = "Encoding"
+     bl_parent_id = "RENDER_PT_output"
      bl_options = {'DEFAULT_CLOSED'}
 -    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL'}
 +    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL', 'BLENDER_LANPR'}
  
      def draw_header_preset(self, context):
          RENDER_PT_ffmpeg_presets.draw_panel_header(self.layout)
diff --cc source/blender/makesdna/DNA_scene_types.h
index deb64befc99,63a6a191b9e..cc8284aeba8
--- 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;           /* bitflags for layer visibility */
 +	int layact;     /* active layer */
- 	unsigned int lay_updated;       /* runtime flag, has layer ever been updated since load? */
+ 	unsigned int pad1;
  
 -	short flag;								/* various settings */
 +	short flag;                             /* various settings */
  
  	char use_nodes;
  	char pad[1];