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

[Nick Wu]

Commit: c94b494f20de24f8fbecd97b324a5739bdf02970
Author: Nick Wu
Date:   Mon Nov 26 20:15:13 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBc94b494f20de24f8fbecd97b324a5739bdf02970

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

# Conflicts:
#	release/scripts/addons
#	release/scripts/addons_contrib
#	source/blender/makesdna/DNA_scene_types.h
#	source/blender/makesrna/intern/rna_scene.c
#	source/tools

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



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

diff --cc source/blender/makesdna/DNA_scene_types.h
index 900567e5c9b,7ab4187de1a..fe2dc62a43e
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -1857,35 -1794,52 +1859,52 @@@ extern const char *RE_engine_id_CYCLES
  /* Current precision is 16 for the sub-frames closer to MAXFRAME. */
  
  /* for general use */
 -#define MAXFRAME	1048574
 -#define MAXFRAMEF	1048574.0f
 +#define MAXFRAME    1048574
 +#define MAXFRAMEF   1048574.0f
  
 -#define MINFRAME	0
 -#define MINFRAMEF	0.0f
 +#define MINFRAME    0
 +#define MINFRAMEF   0.0f
  
  /* (minimum frame number for current-frame) */
 -#define MINAFRAME	-1048574
 -#define MINAFRAMEF	-1048574.0f
 +#define MINAFRAME   -1048574
 +#define MINAFRAMEF  -1048574.0f
  
  /* deprecate this! */
- #define TESTBASE(base)  (                                                     \
+ #define TESTBASE(v3d, base)  (                                                \
+ 	(((v3d)->localvd == NULL) || ((v3d)->local_view_uuid & (base)->local_view_bits)) && \
+ 	(((1 << (base)->object->type) & (v3d)->object_type_exclude_viewport) == 0) && \
 -	(((base)->flag & BASE_SELECTED) != 0) &&                                  \
 -	(((base)->flag & BASE_VISIBLE) != 0))
 +		(((base)->flag & BASE_SELECTED) != 0) &&                                  \
 +		(((base)->flag & BASE_VISIBLE) != 0))
- #define TESTBASELIB(base)  (                                                  \
+ #define TESTBASELIB(v3d, base)  (                                             \
+ 	(((v3d)->localvd == NULL) || ((v3d)->local_view_uuid & (base)->local_view_bits)) && \
+ 	(((1 << (base)->object->type) & (v3d)->object_type_exclude_viewport) == 0) && \
 -	(((base)->flag & BASE_SELECTED) != 0) &&                                  \
 -	((base)->object->id.lib == NULL) &&                                       \
 -	(((base)->flag & BASE_VISIBLE) != 0))
 +		(((base)->flag & BASE_SELECTED) != 0) &&                                  \
 +		((base)->object->id.lib == NULL) &&                                       \
 +		(((base)->flag & BASE_VISIBLE) != 0))
- #define TESTBASELIB_BGMODE(base)  (                                           \
+ #define TESTBASELIB_BGMODE(v3d, base)  (                                      \
+ 	((v3d == NULL) || ((v3d)->localvd == NULL) || ((v3d)->local_view_uuid & (base)->local_view_bits)) && \
+ 	((v3d == NULL) || (((1 << (base)->object->type) & (v3d)->object_type_exclude_viewport) == 0)) && \
 -	(((base)->flag & BASE_SELECTED) != 0) &&                                  \
 -	((base)->object->id.lib == NULL) &&                                       \
 -	(((base)->flag & BASE_VISIBLE) != 0))
 +		(((base)->flag & BASE_SELECTED) != 0) &&                                  \
 +		((base)->object->id.lib == NULL) &&                                       \
 +		(((base)->flag & BASE_VISIBLE) != 0))
- #define BASE_EDITABLE_BGMODE(base)  (                                         \
+ #define BASE_EDITABLE_BGMODE(v3d, base)  (                                    \
+ 	((v3d == NULL) || ((v3d)->localvd == NULL) || ((v3d)->local_view_uuid & (base)->local_view_bits)) && \
+ 	((v3d == NULL) || (((1 << (base)->object->type) & (v3d)->object_type_exclude_viewport) == 0)) && \
 -	((base)->object->id.lib == NULL) &&                                       \
 -	(((base)->flag & BASE_VISIBLE) != 0))
 +		((base)->object->id.lib == NULL) &&                                       \
 +		(((base)->flag & BASE_VISIBLE) != 0))
- #define BASE_SELECTABLE(base)                                                 \
- 	(((base)->flag & BASE_SELECTABLE) != 0)
- #define BASE_VISIBLE(base)  (                                                 \
- 		((base)->flag & BASE_VISIBLE) != 0)
+ #define BASE_SELECTABLE(v3d, base)  (                                         \
+ 	(((v3d)->localvd == NULL) || ((v3d)->local_view_uuid & (base)->local_view_bits)) && \
+ 	(((1 << (base)->object->type) & (v3d)->object_type_exclude_viewport) == 0) && \
+ 	(((1 << (base)->object->type) & (v3d)->object_type_exclude_select) == 0) && \
+ 	(((base)->flag & BASE_SELECTABLE) != 0))
+ #define BASE_VISIBLE(v3d, base)  (                                            \
+ 	(((v3d)->localvd == NULL) || ((v3d)->local_view_uuid & (base)->local_view_bits)) && \
+ 	(((1 << (base)->object->type) & (v3d)->object_type_exclude_viewport) == 0) && \
+ 	(((base)->flag & BASE_VISIBLE) != 0))
+ #define BASE_VISIBLE_BGMODE(v3d, base) ( \
+ 	((v3d == NULL) || ((v3d)->localvd == NULL) || ((v3d)->local_view_uuid & (base)->local_view_bits)) && \
+ 	((v3d == NULL) || (((1 << (base)->object->type) & (v3d)->object_type_exclude_viewport) == 0)) && \
+ 	(((base)->flag & BASE_VISIBLE) != 0))
  
  #define FIRSTBASE(_view_layer)  ((_view_layer)->object_bases.first)
  #define LASTBASE(_view_layer)   ((_view_layer)->object_bases.last)