diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2021-08-16 04:14:41 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2021-08-16 04:14:41 +0300 |
| commit | ab632243e649bbea4071eca181f10e18437e1724 (patch) | |
| tree | ad19cb54bf19dd7b4c2f27b0514a51ef9de55223 /source/blender/draw/engines | |
| parent | 8510c77b9cbe1d9d90b5471c4bfcef943a30f6ab (diff) | |
| parent | 899935d5d02463187617d1adc5f0c0f41fe56265 (diff) | |
Merge branch 'master' into temp_bmesh_multires
Diffstat (limited to 'source/blender/draw/engines')
| -rw-r--r-- | source/blender/draw/engines/overlay/overlay_extra.c | 3 | ||||
| -rw-r--r-- | source/blender/draw/engines/select/select_debug_engine.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_extra.c b/source/blender/draw/engines/overlay/overlay_extra.c index f5be9c846d1..2a9080eb217 100644 --- a/source/blender/draw/engines/overlay/overlay_extra.c +++ b/source/blender/draw/engines/overlay/overlay_extra.c @@ -1357,7 +1357,8 @@ static void OVERLAY_relationship_lines(OVERLAY_ExtraCallBuffers *cb, } } } - BKE_constraints_clear_evalob(cob); + /* NOTE: Don't use BKE_constraints_clear_evalob here as that will reset ob->constinv. */ + MEM_freeN(cob); } } diff --git a/source/blender/draw/engines/select/select_debug_engine.c b/source/blender/draw/engines/select/select_debug_engine.c index ded96be23f3..e9437c5ab92 100644 --- a/source/blender/draw/engines/select/select_debug_engine.c +++ b/source/blender/draw/engines/select/select_debug_engine.c @@ -19,7 +19,7 @@ /** \file * \ingroup draw_engine * - * Engine for debuging the selection map drawing. + * Engine for debugging the selection map drawing. */ #include "DNA_ID.h" |