blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Germano Cavalcante 2021-10-27 19:07:40 -03:00
parent 7d2c759054 b838eaf2b9
commit a2f0f98271
Notes: blender-bot 2023-02-14 02:30:11 +01:00 
Referenced by issue #92798, Shading looks different between Geo Nodes Displacement and Shader Displacement
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/include/ED_view3d.h
View File

@ -304,7 +304,6 @@ void ED_view3d_cursor_snap_draw_util(struct RegionView3D *rv3d,
const uchar color_line[4],
const uchar color_point[4],
const short snap_elem_type);
void ED_view3d_cursor_snap_exit(void);
/* view3d_iterators.c */

14
source/blender/editors/space_view3d/view3d_cursor_snap.c
View File

@ -883,16 +883,16 @@ static void v3d_cursor_snap_activate(void)
static void v3d_cursor_snap_free(void)
{
SnapCursorDataIntern *data_intern = &g_data_intern;
if (data_intern->handle && G_MAIN->wm.first) {
WM_paint_cursor_end(data_intern->handle);
if (data_intern->handle) {
if (G_MAIN->wm.first) {
WM_paint_cursor_end(data_intern->handle);
}
data_intern->handle = NULL;
}
if (data_intern->snap_context_v3d) {
ED_transform_snap_object_context_destroy(data_intern->snap_context_v3d);
data_intern->snap_context_v3d = NULL;
}
BLI_freelistN(&data_intern->state_intern);
}
void ED_view3d_cursor_snap_state_default_set(V3DSnapCursorState *state)
@ -923,6 +923,7 @@ void ED_view3d_cursor_snap_deactive(V3DSnapCursorState *state)
SnapStateIntern *state_intern = STATE_INTERN_GET(state);
BLI_remlink(&data_intern->state_intern, state_intern);
MEM_freeN(state_intern);
if (BLI_listbase_is_empty(&data_intern->state_intern)) {
v3d_cursor_snap_free();
}
@ -973,8 +974,3 @@ struct SnapObjectContext *ED_view3d_cursor_snap_context_ensure(Scene *scene)
v3d_cursor_snap_context_ensure(scene);
return data_intern->snap_context_v3d;
}
void ED_view3d_cursor_snap_exit(void)
{
v3d_cursor_snap_free();
}

1
source/blender/windowmanager/intern/wm_init_exit.c
View File

@ -548,7 +548,6 @@ void WM_exit_ex(bContext *C, const bool do_python)
ED_preview_free_dbase(); /* frees a Main dbase, before BKE_blender_free! */
ED_assetlist_storage_exit();
ED_view3d_cursor_snap_exit();
if (wm) {
/* Before BKE_blender_free! - since the ListBases get freed there. */