Merge branch 'blender-v4.5-release'
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
#include "BKE_modifier.hh"
|
||||
#include "BKE_report.hh"
|
||||
#include "BKE_scene.hh"
|
||||
#include "BKE_screen.hh"
|
||||
|
||||
#include "DNA_curves_types.h"
|
||||
#include "DNA_modifier_types.h"
|
||||
@@ -295,6 +296,8 @@ static void lineart_bake_startjob(void *customdata, wmJobWorkerStatus *worker_st
|
||||
|
||||
guard_modifiers(*bj);
|
||||
|
||||
BKE_spacedata_draw_locks(true);
|
||||
|
||||
for (int frame = bj->frame_begin; frame <= bj->frame_end; frame += bj->frame_increment) {
|
||||
|
||||
if (G.is_break) {
|
||||
@@ -331,6 +334,7 @@ static void lineart_bake_endjob(void *customdata)
|
||||
{
|
||||
LineartBakeJob *bj = static_cast<LineartBakeJob *>(customdata);
|
||||
|
||||
BKE_spacedata_draw_locks(false);
|
||||
WM_set_locked_interface(CTX_wm_manager(bj->C), false);
|
||||
|
||||
WM_main_add_notifier(NC_SCENE | ND_FRAME, bj->scene);
|
||||
|
||||
@@ -1239,6 +1239,7 @@ void ED_spacetype_image()
|
||||
art->init = image_main_region_init;
|
||||
art->draw = image_main_region_draw;
|
||||
art->listener = image_main_region_listener;
|
||||
art->lock = 1; /* can become flag, see BKE_spacedata_draw_locks */
|
||||
BLI_addhead(&st->regiontypes, art);
|
||||
|
||||
/* regions: list-view/buttons/scopes */
|
||||
|
||||
Reference in New Issue
Block a user