Commit: 0ed55524f150003a0121c4e7e5f5c26c52184e00
Author: Yiming Wu
Date: Sat Jan 5 17:29:09 2019 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB0ed55524f150003a0121c4e7e5f5c26c52184e00
Merge remote-tracking branch 'origin/master' into soc-2018-npr
# Conflicts:
# release/datafiles/locale
# 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 3857f52678c,4b66ee62269..b053cec6a25
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -192,9 -192,9 +192,9 @@@ typedef struct AudioData
typedef struct SceneRenderLayer {
struct SceneRenderLayer *next, *prev;
- char name[64] DNA_DEPRECATED; /* MAX_NAME */
+ char name[64] DNA_DEPRECATED; /* MAX_NAME */
- struct Material *mat_override DNA_DEPRECATED; /* Converted to ViewLayer
override. */
+ struct Material *mat_override DNA_DEPRECATED; /* Converted to ViewLayer
setting. */
unsigned int lay DNA_DEPRECATED; /* Converted to LayerCollection cycles
camera visibility override. */
unsigned int lay_zmask DNA_DEPRECATED; /* Converted to LayerCollection
cycles holdout override. */
@@@ -1587,9 -1517,24 +1583,24 @@@ typedef struct SceneLANPR
/* *************************************************************** */
/* Scene ID-Block */
+ typedef struct TransformOrientationSlot {
+ int type;
+ int index_custom;
+ char flag;
+ char _pad0[7];
+ } TransformOrientationSlot;
+
+ /* Indices when used in Scene.orientation. */
+ enum {
+ SCE_ORIENT_DEFAULT = 0,
+ SCE_ORIENT_TRANSLATE = 1,
+ SCE_ORIENT_ROTATE = 2,
+ SCE_ORIENT_SCALE = 3,
+ };
+
typedef struct Scene {
ID id;
- struct AnimData *adt; /* animation data (must be immediately after id
for utilities to use it) */
+ struct AnimData *adt; /* animation data (must be immediately after id
for utilities to use it) */
struct Object *camera;
struct World *world;
@@@ -1866,53 -1808,44 +1877,44 @@@ 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(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))
- #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))
- #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))
- #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))
- #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) && \
+ #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) ( \
+ #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)) && \
+ ((v3d == NULL) || (((1 << (base)->object->type) &
(v3d)->object_type_exclude_viewport) == 0)) && \
(((base)->flag & BASE_VISIBLE) != 0))
+ #define BASE_SELECTABLE(v3d, base) (
\
+ BASE_VISIBLE(v3d, base) &&
\
+ (((1 << (base)->object->type) & (v3d)->object_type_exclude_select) ==
0) && \
+ (((base)->flag & BASE_SELECTABLE) != 0))
+ #define BASE_SELECTABLE_BGMODE(v3d, base) (
\
+ BASE_VISIBLE_BGMODE(v3d, base) &&
\
+ ((v3d == NULL) || (((1 << (base)->object->type) &
(v3d)->object_type_exclude_select) == 0)) && \
+ (((base)->flag & BASE_SELECTABLE) != 0))
+
+ #define TESTBASE(v3d, base) \
+ (BASE_VISIBLE(v3d, base) && (((base)->flag & BASE_SELECTED) != 0))
+ #define TESTBASELIB(v3d, base) \
+ (TESTBASE(v3d, base) && ((base)->object->id.lib == NULL))
+ #define BASE_EDITABLE_BGMODE(v3d, base) \
+ (BASE_VISIBLE_BGMODE(v3d, base) && ((base)->object->id.lib == NULL))
+ #define TESTBASELIB_BGMODE(v3d, base) \
+ (BASE_EDITABLE_BGMODE(v3d, base) && (((base)->flag & BASE_SELECTED) !=
0))
+
#define FIRSTBASE(_view_layer) ((_view_layer)->object_bases.first)
#define LASTBASE(_view_layer) ((_view_layer)->object_bases.last)
#define BASACT(_view_layer) ((_view_layer)->basact)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
