Commit: 6b0dd041e170bee3b7de9d2a2bead09287d577d2
Author: Bastien Montagne
Date: Mon Feb 4 11:30:02 2019 +0100
Branches: asset-engine
https://developer.blender.org/rB6b0dd041e170bee3b7de9d2a2bead09287d577d2
Merge branch 'master' into asset-engine
Conflicts:
source/blender/blenkernel/BKE_global.h
source/blender/python/intern/bpy_app.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_global.h
index eae14151cfa,706dec7580c..852bd146f77
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@@ -114,30 -104,29 +104,33 @@@ typedef struct Global
/* **************** GLOBAL ********************* */
- /* G.f */
- #define G_RENDER_OGL (1 << 0)
- #define G_SWAP_EXCHANGE (1 << 1)
- /* #define G_RENDER_SHADOW (1 << 3) */ /* temp flag, removed */
- #define G_BACKBUFSEL (1 << 4)
- #define G_PICKSEL (1 << 5)
-
- /* #define G_FACESELECT (1 << 8) use (mesh->editflag &
ME_EDIT_PAINT_FACE_SEL) */
-
- #define G_ASSETS_NEED_RELOAD (1 << 10)
- #define G_ASSETS_FAIL (1 << 11)
- #define G_ASSETS_QUIET (1 << 12)
-
- #define G_SCRIPT_AUTOEXEC (1 << 13)
- #define G_SCRIPT_OVERRIDE_PREF (1 << 14) /* when this flag is set ignore the
userprefs */
- #define G_SCRIPT_AUTOEXEC_FAIL (1 << 15)
- #define G_SCRIPT_AUTOEXEC_FAIL_QUIET (1 << 16)
+ /** #Global.f */
+ enum {
+ G_FLAG_RENDER_VIEWPORT = (1 << 0),
+ G_FLAG_BACKBUFSEL = (1 << 1),
+ G_FLAG_PICKSEL = (1 << 2),
+ /** Support simulating events (for testing). */
+ G_FLAG_EVENT_SIMULATE = (1 << 3),
+
++ G_ASSETS_NEED_RELOAD = (1 << 10),
++ G_ASSETS_FAIL = (1 << 11),
++ G_ASSETS_QUIET = (1 << 12),
++
+ G_FLAG_SCRIPT_AUTOEXEC = (1 << 13),
+ /** When this flag is set ignore the prefs
#USER_SCRIPT_AUTOEXEC_DISABLE. */
+ G_FLAG_SCRIPT_OVERRIDE_PREF = (1 << 14),
+ G_FLAG_SCRIPT_AUTOEXEC_FAIL = (1 << 15),
+ G_FLAG_SCRIPT_AUTOEXEC_FAIL_QUIET = (1 << 16),
+ };
- /* #define G_NOFROZEN (1 << 17) also removed */
- /* #define G_GREASEPENCIL (1 << 17) also removed */
+ /** Don't overwrite these flags when reading a file. */
+ #define G_FLAG_ALL_RUNTIME \
+ (G_FLAG_SCRIPT_AUTOEXEC | G_FLAG_SCRIPT_OVERRIDE_PREF |
G_FLAG_EVENT_SIMULATE)
- /* #define G_AUTOMATKEYS (1 << 30) also removed */
+ /** Flags to read from blend file. */
+ #define G_FLAG_ALL_READFILE 0
- /* G.debug */
+ /** #Global.debug */
enum {
G_DEBUG = (1 << 0), /* general debug flag, print more info
in unexpected cases */
G_DEBUG_FFMPEG = (1 << 1),
diff --cc source/blender/python/intern/bpy_app.c
index 9497c0a8eaa,1a0bc8db810..bb74fb672f9
--- a/source/blender/python/intern/bpy_app.c
+++ b/source/blender/python/intern/bpy_app.c
@@@ -418,17 -442,10 +442,17 @@@ static PyGetSetDef bpy_app_getsets[] =
{(char *)"render_preview_size", bpy_app_preview_render_size_get, NULL,
(char *)bpy_app_preview_render_size_doc, (void *)ICON_SIZE_PREVIEW},
/* security */
- {(char *)"autoexec_fail", bpy_app_global_flag_get, NULL, NULL, (void
*)G_SCRIPT_AUTOEXEC_FAIL},
- {(char *)"autoexec_fail_quiet", bpy_app_global_flag_get, NULL, NULL,
(void *)G_SCRIPT_AUTOEXEC_FAIL_QUIET},
+ {(char *)"autoexec_fail", bpy_app_global_flag_get, NULL, NULL, (void
*)G_FLAG_SCRIPT_AUTOEXEC_FAIL},
+ {(char *)"autoexec_fail_quiet", bpy_app_global_flag_get, NULL, NULL,
(void *)G_FLAG_SCRIPT_AUTOEXEC_FAIL_QUIET},
{(char *)"autoexec_fail_message", bpy_app_autoexec_fail_message_get,
NULL, NULL, NULL},
+
+ /* Assets */
+ {(char *)"assets_need_reload", bpy_app_global_flag_get, NULL, NULL,
(void *)G_ASSETS_NEED_RELOAD},
+ {(char *)"assets_fail", bpy_app_global_flag_get, NULL, NULL, (void
*)G_ASSETS_FAIL},
+ {(char *)"assets_quiet", bpy_app_global_flag_get, NULL, NULL, (void
*)G_ASSETS_QUIET},
+// {(char *)"assets_fail_message", bpy_app_autoexec_fail_message_get,
NULL, NULL, NULL},
+
- {NULL, NULL, NULL, NULL, NULL}
+ {NULL, NULL, NULL, NULL, NULL},
};
static void py_struct_seq_getset_init(void)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
