Commit: 5376c739f5bf4029e0a32946e9945a732feba217
Author: Campbell Barton
Date: Tue Feb 6 23:06:23 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB5376c739f5bf4029e0a32946e9945a732feba217
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/editors/include/ED_object.h
index 7ceab58aa33,d74fb22faf8..5c04614f4f1
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@@ -55,8 -53,9 +55,10 @@@ struct wmOperatorType
struct PointerRNA;
struct PropertyRNA;
struct EnumPropertyItem;
+struct EvaluationContext;
+ #include "DNA_object_enums.h"
+
/* object_edit.c */
struct Object *ED_object_context(struct bContext *C); /*
context.object */
struct Object *ED_object_active_context(struct bContext *C); /*
context.object or context.active_object */
diff --cc source/blender/makesdna/DNA_object_types.h
index 7c3ef5e72be,e0b4d117bd1..17ee64fd7d8
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@@ -704,32 -673,7 +706,13 @@@ enum
OB_LOCK_ROTW = 1 << 9,
OB_LOCK_ROT4D = 1 << 10,
};
-
+
+/* ob->duplicator_visibility_flag */
+enum {
+ OB_DUPLI_FLAG_VIEWPORT = 1 << 0,
+ OB_DUPLI_FLAG_RENDER = 1 << 1,
+};
+
- /* ob->mode */
- typedef enum eObjectMode {
- OB_MODE_OBJECT = 0,
- OB_MODE_EDIT = 1 << 0,
- OB_MODE_SCULPT = 1 << 1,
- OB_MODE_VERTEX_PAINT = 1 << 2,
- OB_MODE_WEIGHT_PAINT = 1 << 3,
- OB_MODE_TEXTURE_PAINT = 1 << 4,
- OB_MODE_PARTICLE_EDIT = 1 << 5,
- OB_MODE_POSE = 1 << 6,
- OB_MODE_GPENCIL = 1 << 7, /* NOTE: Just a dummy to make the UI
nicer */
- } eObjectMode;
-
- /* any mode where the brush system is used */
- #define OB_MODE_ALL_PAINT (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT |
OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)
-
- /* any mode that uses ob->sculpt */
- #define OB_MODE_ALL_SCULPT (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT |
OB_MODE_WEIGHT_PAINT)
-
#define MAX_DUPLI_RECUR 8
#ifdef __cplusplus
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
