Cleanup: rename locked interface setting functions
Follow the convention of using terms such as get/set as a suffix.
This commit is contained in:
@@ -352,11 +352,11 @@ static bAction *flip_pose(bContext *C, blender::Span<Object *> objects, bAction
|
||||
* pose, which can cause unwanted visual glitches. */
|
||||
wmWindowManager *wm = CTX_wm_manager(C);
|
||||
const bool interface_was_locked = CTX_wm_interface_locked(C);
|
||||
WM_set_locked_interface(wm, true);
|
||||
WM_locked_interface_set(wm, true);
|
||||
|
||||
BKE_action_flip_with_pose(action_copy, objects);
|
||||
|
||||
WM_set_locked_interface(wm, interface_was_locked);
|
||||
WM_locked_interface_set(wm, interface_was_locked);
|
||||
return action_copy;
|
||||
}
|
||||
|
||||
|
||||
@@ -334,7 +334,7 @@ static void lineart_bake_endjob(void *customdata)
|
||||
{
|
||||
LineartBakeJob *bj = static_cast<LineartBakeJob *>(customdata);
|
||||
|
||||
WM_set_locked_interface(CTX_wm_manager(bj->C), false);
|
||||
WM_locked_interface_set(CTX_wm_manager(bj->C), false);
|
||||
|
||||
WM_main_add_notifier(NC_SCENE | ND_FRAME, bj->scene);
|
||||
|
||||
@@ -400,7 +400,7 @@ static wmOperatorStatus lineart_bake_common(bContext *C,
|
||||
WM_jobs_timer(wm_job, 0.1, NC_GPENCIL | ND_DATA | NA_EDITED, NC_GPENCIL | ND_DATA | NA_EDITED);
|
||||
WM_jobs_callbacks(wm_job, lineart_bake_startjob, nullptr, nullptr, lineart_bake_endjob);
|
||||
|
||||
WM_set_locked_interface_with_flags(CTX_wm_manager(C), REGION_DRAW_LOCK_BAKING);
|
||||
WM_locked_interface_set_with_flags(CTX_wm_manager(C), REGION_DRAW_LOCK_BAKING);
|
||||
|
||||
WM_jobs_start(CTX_wm_manager(C), wm_job);
|
||||
|
||||
|
||||
@@ -75,7 +75,7 @@ static void simulate_to_frame_startjob(void *customdata, wmJobWorkerStatus *work
|
||||
SimulateToFrameJob &job = *static_cast<SimulateToFrameJob *>(customdata);
|
||||
G.is_rendering = true;
|
||||
G.is_break = false;
|
||||
WM_set_locked_interface(job.wm, true);
|
||||
WM_locked_interface_set(job.wm, true);
|
||||
|
||||
Vector<Object *> objects_to_calc;
|
||||
for (Object *object : job.objects) {
|
||||
@@ -133,7 +133,7 @@ static void simulate_to_frame_startjob(void *customdata, wmJobWorkerStatus *work
|
||||
static void simulate_to_frame_endjob(void *customdata)
|
||||
{
|
||||
SimulateToFrameJob &job = *static_cast<SimulateToFrameJob *>(customdata);
|
||||
WM_set_locked_interface(job.wm, false);
|
||||
WM_locked_interface_set(job.wm, false);
|
||||
G.is_rendering = false;
|
||||
WM_main_add_notifier(NC_OBJECT | ND_MODIFIER, nullptr);
|
||||
}
|
||||
@@ -440,7 +440,7 @@ static void bake_geometry_nodes_startjob(void *customdata, wmJobWorkerStatus *wo
|
||||
static void bake_geometry_nodes_endjob(void *customdata)
|
||||
{
|
||||
BakeGeometryNodesJob &job = *static_cast<BakeGeometryNodesJob *>(customdata);
|
||||
WM_set_locked_interface(job.wm, false);
|
||||
WM_locked_interface_set(job.wm, false);
|
||||
G.is_rendering = false;
|
||||
WM_main_add_notifier(NC_OBJECT | ND_MODIFIER, nullptr);
|
||||
WM_main_add_notifier(NC_NODE | ND_DISPLAY, nullptr);
|
||||
@@ -565,7 +565,7 @@ static wmOperatorStatus start_bake_job(bContext *C,
|
||||
job->depsgraph = CTX_data_depsgraph_pointer(C);
|
||||
job->scene = CTX_data_scene(C);
|
||||
job->bake_requests = std::move(requests);
|
||||
WM_set_locked_interface(job->wm, true);
|
||||
WM_locked_interface_set(job->wm, true);
|
||||
|
||||
if (mode == BakeRequestsMode::Sync) {
|
||||
wmJobWorkerStatus worker_status{};
|
||||
|
||||
@@ -928,7 +928,7 @@ static void quadriflow_end_job(void *customdata)
|
||||
Object *ob = qj->owner;
|
||||
|
||||
if (qj->is_nonblocking_job) {
|
||||
WM_set_locked_interface(static_cast<wmWindowManager *>(G_MAIN->wm.first), false);
|
||||
WM_locked_interface_set(static_cast<wmWindowManager *>(G_MAIN->wm.first), false);
|
||||
}
|
||||
|
||||
ReportList *reports = qj->worker_status->reports;
|
||||
@@ -1021,7 +1021,7 @@ static wmOperatorStatus quadriflow_remesh_exec(bContext *C, wmOperator *op)
|
||||
WM_jobs_timer(wm_job, 0.1, NC_GEOM | ND_DATA, NC_GEOM | ND_DATA);
|
||||
WM_jobs_callbacks(wm_job, quadriflow_start_job, nullptr, nullptr, quadriflow_end_job);
|
||||
|
||||
WM_set_locked_interface(CTX_wm_manager(C), true);
|
||||
WM_locked_interface_set(CTX_wm_manager(C), true);
|
||||
|
||||
WM_jobs_start(CTX_wm_manager(C), wm_job);
|
||||
}
|
||||
|
||||
@@ -317,7 +317,7 @@ static void dpaint_bake_endjob(void *customdata)
|
||||
|
||||
G.is_rendering = false;
|
||||
|
||||
WM_set_locked_interface(static_cast<wmWindowManager *>(G_MAIN->wm.first), false);
|
||||
WM_locked_interface_set(static_cast<wmWindowManager *>(G_MAIN->wm.first), false);
|
||||
|
||||
/* Bake was successful:
|
||||
* Report for ended bake and how long it took */
|
||||
@@ -505,7 +505,7 @@ static wmOperatorStatus dynamicpaint_bake_exec(bContext *C, wmOperator *op)
|
||||
WM_jobs_timer(wm_job, 0.1, NC_OBJECT | ND_MODIFIER, NC_OBJECT | ND_MODIFIER);
|
||||
WM_jobs_callbacks(wm_job, dpaint_bake_startjob, nullptr, nullptr, dpaint_bake_endjob);
|
||||
|
||||
WM_set_locked_interface_with_flags(CTX_wm_manager(C), REGION_DRAW_LOCK_BAKING);
|
||||
WM_locked_interface_set_with_flags(CTX_wm_manager(C), REGION_DRAW_LOCK_BAKING);
|
||||
|
||||
/* Bake Dynamic Paint */
|
||||
WM_jobs_start(CTX_wm_manager(C), wm_job);
|
||||
|
||||
@@ -330,7 +330,7 @@ static void fluid_bake_endjob(void *customdata)
|
||||
DEG_id_tag_update(&job->ob->id, ID_RECALC_GEOMETRY);
|
||||
|
||||
G.is_rendering = false;
|
||||
WM_set_locked_interface(static_cast<wmWindowManager *>(G_MAIN->wm.first), false);
|
||||
WM_locked_interface_set(static_cast<wmWindowManager *>(G_MAIN->wm.first), false);
|
||||
|
||||
/* Bake was successful:
|
||||
* Report for ended bake and how long it took. */
|
||||
@@ -436,7 +436,7 @@ static void fluid_free_endjob(void *customdata)
|
||||
FluidDomainSettings *fds = job->fmd->domain;
|
||||
|
||||
G.is_rendering = false;
|
||||
WM_set_locked_interface(static_cast<wmWindowManager *>(G_MAIN->wm.first), false);
|
||||
WM_locked_interface_set(static_cast<wmWindowManager *>(G_MAIN->wm.first), false);
|
||||
|
||||
/* Reflect the now empty cache in the viewport too. */
|
||||
DEG_id_tag_update(&job->ob->id, ID_RECALC_GEOMETRY);
|
||||
@@ -570,7 +570,7 @@ static wmOperatorStatus fluid_bake_invoke(bContext *C, wmOperator *op, const wmE
|
||||
WM_jobs_timer(wm_job, 0.01, NC_OBJECT | ND_MODIFIER, NC_OBJECT | ND_MODIFIER);
|
||||
WM_jobs_callbacks(wm_job, fluid_bake_startjob, nullptr, nullptr, fluid_bake_endjob);
|
||||
|
||||
WM_set_locked_interface_with_flags(CTX_wm_manager(C), REGION_DRAW_LOCK_BAKING);
|
||||
WM_locked_interface_set_with_flags(CTX_wm_manager(C), REGION_DRAW_LOCK_BAKING);
|
||||
|
||||
WM_jobs_start(CTX_wm_manager(C), wm_job);
|
||||
WM_event_add_modal_handler(C, op);
|
||||
@@ -652,7 +652,7 @@ static wmOperatorStatus fluid_free_exec(bContext *C, wmOperator *op)
|
||||
WM_jobs_timer(wm_job, 0.01, NC_OBJECT | ND_MODIFIER, NC_OBJECT | ND_MODIFIER);
|
||||
WM_jobs_callbacks(wm_job, fluid_free_startjob, nullptr, nullptr, fluid_free_endjob);
|
||||
|
||||
WM_set_locked_interface_with_flags(CTX_wm_manager(C), REGION_DRAW_LOCK_BAKING);
|
||||
WM_locked_interface_set_with_flags(CTX_wm_manager(C), REGION_DRAW_LOCK_BAKING);
|
||||
|
||||
/* Free Fluid Geometry */
|
||||
WM_jobs_start(CTX_wm_manager(C), wm_job);
|
||||
|
||||
@@ -140,7 +140,7 @@ static void ptcache_job_startjob(void *customdata, wmJobWorkerStatus *worker_sta
|
||||
/* XXX annoying hack: needed to prevent data corruption when changing
|
||||
* scene frame in separate threads
|
||||
*/
|
||||
WM_set_locked_interface(job->wm, true);
|
||||
WM_locked_interface_set(job->wm, true);
|
||||
|
||||
BKE_ptcache_bake(job->baker);
|
||||
|
||||
@@ -153,7 +153,7 @@ static void ptcache_job_endjob(void *customdata)
|
||||
PointCacheJob *job = static_cast<PointCacheJob *>(customdata);
|
||||
Scene *scene = job->baker->scene;
|
||||
|
||||
WM_set_locked_interface(job->wm, false);
|
||||
WM_locked_interface_set(job->wm, false);
|
||||
|
||||
WM_main_add_notifier(NC_SCENE | ND_FRAME, scene);
|
||||
WM_main_add_notifier(NC_OBJECT | ND_POINTCACHE, job->baker->pid.owner_id);
|
||||
@@ -230,7 +230,7 @@ static wmOperatorStatus ptcache_bake_invoke(bContext *C, wmOperator *op, const w
|
||||
WM_jobs_timer(wm_job, 0.1, NC_OBJECT | ND_POINTCACHE, NC_OBJECT | ND_POINTCACHE);
|
||||
WM_jobs_callbacks(wm_job, ptcache_job_startjob, nullptr, nullptr, ptcache_job_endjob);
|
||||
|
||||
WM_set_locked_interface(CTX_wm_manager(C), true);
|
||||
WM_locked_interface_set(CTX_wm_manager(C), true);
|
||||
|
||||
WM_jobs_start(CTX_wm_manager(C), wm_job);
|
||||
|
||||
|
||||
@@ -843,7 +843,7 @@ static void render_endjob(void *rjv)
|
||||
* and using one from Global will unlock exactly the same manager as
|
||||
* was locked before running the job.
|
||||
*/
|
||||
WM_set_locked_interface(static_cast<wmWindowManager *>(G_MAIN->wm.first), false);
|
||||
WM_locked_interface_set(static_cast<wmWindowManager *>(G_MAIN->wm.first), false);
|
||||
DEG_tag_on_visible_update(G_MAIN, false);
|
||||
}
|
||||
}
|
||||
@@ -1062,7 +1062,7 @@ static wmOperatorStatus screen_render_invoke(bContext *C, wmOperator *op, const
|
||||
|
||||
/* Lock the user interface depending on render settings. */
|
||||
if (scene->r.use_lock_interface) {
|
||||
WM_set_locked_interface_with_flags(CTX_wm_manager(C), REGION_DRAW_LOCK_RENDER);
|
||||
WM_locked_interface_set_with_flags(CTX_wm_manager(C), REGION_DRAW_LOCK_RENDER);
|
||||
|
||||
/* Set flag interface need to be unlocked.
|
||||
*
|
||||
|
||||
@@ -79,7 +79,7 @@ static bool solve_camera_initjob(
|
||||
|
||||
tracking->stats = MEM_callocN<MovieTrackingStats>("solve camera stats");
|
||||
|
||||
WM_set_locked_interface(scj->wm, true);
|
||||
WM_locked_interface_set(scj->wm, true);
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -114,7 +114,7 @@ static void solve_camera_freejob(void *scv)
|
||||
/* WindowManager is missing in the job when initialization is incomplete.
|
||||
* In this case the interface is not locked either. */
|
||||
if (scj->wm != nullptr) {
|
||||
WM_set_locked_interface(scj->wm, false);
|
||||
WM_locked_interface_set(scj->wm, false);
|
||||
}
|
||||
|
||||
if (!scj->context) {
|
||||
|
||||
@@ -195,7 +195,7 @@ static bool track_markers_initjob(bContext *C, TrackMarkersJob *tmj, bool backwa
|
||||
return false;
|
||||
}
|
||||
|
||||
WM_set_locked_interface(tmj->wm, true);
|
||||
WM_locked_interface_set(tmj->wm, true);
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -278,7 +278,7 @@ static void track_markers_freejob(void *tmv)
|
||||
{
|
||||
TrackMarkersJob *tmj = (TrackMarkersJob *)tmv;
|
||||
tmj->clip->tracking_context = nullptr;
|
||||
WM_set_locked_interface(tmj->wm, false);
|
||||
WM_locked_interface_set(tmj->wm, false);
|
||||
BKE_autotrack_context_free(tmj->context);
|
||||
MEM_freeN(tmj);
|
||||
}
|
||||
|
||||
@@ -1712,7 +1712,7 @@ static void pack_islands_freejob(void *pidv)
|
||||
{
|
||||
WM_cursor_wait(false);
|
||||
UVPackIslandsData *pid = static_cast<UVPackIslandsData *>(pidv);
|
||||
WM_set_locked_interface(pid->wm, false);
|
||||
WM_locked_interface_set(pid->wm, false);
|
||||
MEM_delete(pid);
|
||||
}
|
||||
|
||||
@@ -1801,7 +1801,7 @@ static wmOperatorStatus pack_islands_exec(bContext *C, wmOperator *op)
|
||||
pid->wm, CTX_wm_window(C), scene, "Packing UVs", WM_JOB_PROGRESS, WM_JOB_TYPE_UV_PACK);
|
||||
WM_jobs_customdata_set(wm_job, pid, pack_islands_freejob);
|
||||
WM_jobs_timer(wm_job, 0.1, 0, 0);
|
||||
WM_set_locked_interface_with_flags(pid->wm, REGION_DRAW_LOCK_RENDER);
|
||||
WM_locked_interface_set_with_flags(pid->wm, REGION_DRAW_LOCK_RENDER);
|
||||
WM_jobs_callbacks(wm_job, pack_islands_startjob, nullptr, nullptr, pack_islands_endjob);
|
||||
|
||||
WM_cursor_wait(true);
|
||||
|
||||
@@ -88,7 +88,7 @@ static void export_startjob(void *customdata, wmJobWorkerStatus *worker_status)
|
||||
data->start_time = blender::timeit::Clock::now();
|
||||
|
||||
G.is_rendering = true;
|
||||
WM_set_locked_interface(data->wm, true);
|
||||
WM_locked_interface_set(data->wm, true);
|
||||
G.is_break = false;
|
||||
|
||||
worker_status->progress = 0.0f;
|
||||
@@ -195,7 +195,7 @@ static void export_endjob(void *customdata)
|
||||
}
|
||||
|
||||
G.is_rendering = false;
|
||||
WM_set_locked_interface(data->wm, false);
|
||||
WM_locked_interface_set(data->wm, false);
|
||||
report_job_duration(data);
|
||||
}
|
||||
|
||||
|
||||
@@ -629,7 +629,7 @@ static void import_startjob(void *user_data, wmJobWorkerStatus *worker_status)
|
||||
data->progress = &worker_status->progress;
|
||||
data->start_time = blender::timeit::Clock::now();
|
||||
|
||||
WM_set_locked_interface(data->wm, true);
|
||||
WM_locked_interface_set(data->wm, true);
|
||||
float file_progress_factor = 1.0f / float(data->paths.size());
|
||||
for (int idx : data->paths.index_range()) {
|
||||
import_file(data, data->paths[idx].c_str(), file_progress_factor);
|
||||
@@ -711,7 +711,7 @@ static void import_endjob(void *user_data)
|
||||
}
|
||||
}
|
||||
|
||||
WM_set_locked_interface(data->wm, false);
|
||||
WM_locked_interface_set(data->wm, false);
|
||||
|
||||
switch (data->error_code) {
|
||||
default:
|
||||
|
||||
@@ -617,7 +617,7 @@ static void export_startjob(void *customdata, wmJobWorkerStatus *worker_status)
|
||||
|
||||
G.is_rendering = true;
|
||||
if (data->wm) {
|
||||
WM_set_locked_interface(data->wm, true);
|
||||
WM_locked_interface_set(data->wm, true);
|
||||
}
|
||||
G.is_break = false;
|
||||
|
||||
@@ -725,7 +725,7 @@ static void export_endjob(void *customdata)
|
||||
|
||||
G.is_rendering = false;
|
||||
if (data->wm) {
|
||||
WM_set_locked_interface(data->wm, false);
|
||||
WM_locked_interface_set(data->wm, false);
|
||||
}
|
||||
report_job_duration(data);
|
||||
}
|
||||
|
||||
@@ -135,7 +135,7 @@ static void import_startjob(void *customdata, wmJobWorkerStatus *worker_status)
|
||||
|
||||
data->params.worker_status = worker_status;
|
||||
|
||||
WM_set_locked_interface(data->wm, true);
|
||||
WM_locked_interface_set(data->wm, true);
|
||||
G.is_break = false;
|
||||
|
||||
if (data->params.create_collection) {
|
||||
@@ -393,7 +393,7 @@ static void import_endjob(void *customdata)
|
||||
}
|
||||
}
|
||||
|
||||
WM_set_locked_interface(data->wm, false);
|
||||
WM_locked_interface_set(data->wm, false);
|
||||
|
||||
switch (data->error_code) {
|
||||
default:
|
||||
|
||||
@@ -1974,10 +1974,10 @@ void WM_autosave_write(wmWindowManager *wm, Main *bmain);
|
||||
|
||||
/**
|
||||
* Lock the interface for any communication.
|
||||
* For #WM_set_locked_interface_with_flags, #lock_flags is #ARegionDrawLockFlags
|
||||
* For #WM_locked_interface_set_with_flags, #lock_flags is #ARegionDrawLockFlags
|
||||
*/
|
||||
void WM_set_locked_interface(wmWindowManager *wm, bool lock);
|
||||
void WM_set_locked_interface_with_flags(wmWindowManager *wm, short lock_flags);
|
||||
void WM_locked_interface_set(wmWindowManager *wm, bool lock);
|
||||
void WM_locked_interface_set_with_flags(wmWindowManager *wm, short lock_flags);
|
||||
|
||||
void WM_event_tablet_data_default_set(wmTabletData *tablet_data);
|
||||
|
||||
|
||||
@@ -6467,7 +6467,7 @@ static bool wm_operator_check_locked_interface(bContext *C, wmOperatorType *ot)
|
||||
return true;
|
||||
}
|
||||
|
||||
void WM_set_locked_interface_with_flags(wmWindowManager *wm, short lock_flags)
|
||||
void WM_locked_interface_set_with_flags(wmWindowManager *wm, short lock_flags)
|
||||
{
|
||||
/* This will prevent events from being handled while interface is locked
|
||||
*
|
||||
@@ -6481,9 +6481,9 @@ void WM_set_locked_interface_with_flags(wmWindowManager *wm, short lock_flags)
|
||||
BKE_spacedata_draw_locks(static_cast<ARegionDrawLockFlags>(lock_flags));
|
||||
}
|
||||
|
||||
void WM_set_locked_interface(wmWindowManager *wm, bool lock)
|
||||
void WM_locked_interface_set(wmWindowManager *wm, bool lock)
|
||||
{
|
||||
WM_set_locked_interface_with_flags(wm, lock ? REGION_DRAW_LOCK_ALL : 0);
|
||||
WM_locked_interface_set_with_flags(wm, lock ? REGION_DRAW_LOCK_ALL : 0);
|
||||
}
|
||||
|
||||
/** \} */
|
||||
|
||||
Reference in New Issue
Block a user