diff options
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | po/README.txt | 7 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_draw.c | 1 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_rna.h | 8 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 15 |
6 files changed, 23 insertions, 12 deletions
diff --git a/GNUmakefile b/GNUmakefile index 9915406e52c..aad3c58938c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -164,7 +164,7 @@ package_archive: # Other Targets # translations: - $(BUILD_DIR)/bin/blender --background --python po/update_msg.py + $(BUILD_DIR)/bin/blender --background --factory-startup --python po/update_msg.py python3 po/update_pot.py python3 po/update_po.py python3 po/update_mo.py diff --git a/po/README.txt b/po/README.txt index 8756531f442..79b0bf7c062 100644 --- a/po/README.txt +++ b/po/README.txt @@ -37,9 +37,10 @@ When translation was updated, remove line with '#, fuzzy' and it'll work. If there's no message in .po file you want to translate, probably .po file should be updated. Use the following steps for this: -- With newly compiled blender run `blender --background --python update_msg.py` to update - messages.txt file (this file contains strings collected automatically from RNA system and - python UI scripts) +- With newly compiled blender run: + `blender --background --factory-startup --python update_msg.py` + to update messages.txt file (this file contains strings collected + automatically from RNA system and python UI scripts) - Run update_pot.py script which will update blender.pot file. This file contains all strings which should be transated. - Run update_po.py script to merge all .po files with blender.pot (so all .po files diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index b65be48f7ee..a40900fb39b 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -466,6 +466,7 @@ void ui_draw_but_IMAGE(ARegion *UNUSED(ar), uiBut *but, uiWidgetColors *UNUSED(w { #ifdef WITH_HEADLESS (void)rect; + (void)but; #else ImBuf *ibuf= (ImBuf *)but->poin; //GLint scissor[4]; diff --git a/source/blender/python/intern/bpy_rna.h b/source/blender/python/intern/bpy_rna.h index 30f6c02115a..502fa25c872 100644 --- a/source/blender/python/intern/bpy_rna.h +++ b/source/blender/python/intern/bpy_rna.h @@ -44,9 +44,6 @@ /* support for inter references, currently only needed for corner case */ #define USE_PYRNA_STRUCT_REFERENCE -/* use real collection iterators rather than faking with a list */ -#define USE_PYRNA_ITER - #else /* WITH_PYTHON_SAFETY */ /* default, no defines! */ @@ -67,6 +64,11 @@ * so prefer the leak to the memory bloat for now. */ // #define PYRNA_FREE_SUPPORT +/* use real collection iterators rather than faking with a list + * this is needed so enums can be iterated over without crashing, + * since finishing the iteration frees temp allocated enums */ +#define USE_PYRNA_ITER + /* --- end bpy build options --- */ struct ID; diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 3d7737830eb..766be796484 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -427,6 +427,8 @@ void WM_exit_ext(bContext *C, const short do_python) * the pyDriver bug can be fixed if it happens again we can deal with it then */ BPY_python_end(); } +#else + (void)do_python; #endif GPU_global_buffer_pool_free(); diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 841198c0664..b980b45bae4 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1208,9 +1208,6 @@ static int wm_resource_check_prev(void) static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(arg)) { - extern char datatoc_splash_png[]; - extern int datatoc_splash_png_size; - uiBlock *block; uiBut *but; uiLayout *layout, *split, *col; @@ -1219,9 +1216,17 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar int i; MenuType *mt= WM_menutype_find("USERPREF_MT_splash", TRUE); char url[96]; - /* hardcoded to splash, loading and freeing every draw, eek! */ + +#ifndef WITH_HEADLESS + extern char datatoc_splash_png[]; + extern int datatoc_splash_png_size; + ImBuf *ibuf= IMB_ibImageFromMemory((unsigned char*)datatoc_splash_png, datatoc_splash_png_size, IB_rect); - +#else + ImBuf *ibuf= NULL; +#endif + + #ifdef WITH_BUILDINFO int ver_width, rev_width; char *version_str = NULL; |