Merge branch 'blender-v3.0-release'
This commit is contained in:
commit
cea7ee7582
|
@ -56,7 +56,7 @@ static void OVERLAY_engine_init(void *vedata)
|
|||
OVERLAY_shader_library_ensure();
|
||||
|
||||
if (!stl->pd) {
|
||||
/* Alloc transient pointers */
|
||||
/* Allocate transient pointers. */
|
||||
stl->pd = MEM_callocN(sizeof(*stl->pd), __func__);
|
||||
}
|
||||
|
||||
|
@ -235,7 +235,7 @@ BLI_INLINE OVERLAY_DupliData *OVERLAY_duplidata_get(Object *ob, void *vedata, bo
|
|||
*do_init = true;
|
||||
}
|
||||
else if ((*dupli_data)->base_flag != ob->base_flag) {
|
||||
/* Select state might have change, reinit. */
|
||||
/* Select state might have change, reinitialize. */
|
||||
*do_init = true;
|
||||
}
|
||||
return *dupli_data;
|
||||
|
@ -478,7 +478,7 @@ static void OVERLAY_cache_populate(void *vedata, Object *ob)
|
|||
OVERLAY_particle_cache_populate(vedata, ob);
|
||||
}
|
||||
|
||||
/* Relationship, object center, bounbox ... */
|
||||
/* Relationship, object center, bounding-box... etc. */
|
||||
if (!pd->hide_overlays) {
|
||||
OVERLAY_extra_cache_populate(vedata, ob);
|
||||
}
|
||||
|
@ -581,7 +581,7 @@ static void OVERLAY_draw_scene(void *vedata)
|
|||
OVERLAY_extra_blend_draw(vedata);
|
||||
OVERLAY_volume_draw(vedata);
|
||||
|
||||
/* These overlays are drawn here to avoid artifacts with wireframe opacity. */
|
||||
/* These overlays are drawn here to avoid artifacts with wire-frame opacity. */
|
||||
switch (pd->ctx_mode) {
|
||||
case CTX_MODE_SCULPT:
|
||||
OVERLAY_sculpt_draw(vedata);
|
||||
|
|
|
@ -1054,6 +1054,11 @@ void ElementResize(const TransInfo *t,
|
|||
}
|
||||
|
||||
if (t->options & (CTX_OBJECT | CTX_POSE_BONE)) {
|
||||
if (t->options & CTX_POSE_BONE) {
|
||||
/* Without this, the resulting location of scaled bones aren't correct,
|
||||
* especially noticeable scaling root or disconnected bones around the cursor, see T92515. */
|
||||
mul_mat3_m4_v3(tc->poseobj->obmat, vec);
|
||||
}
|
||||
mul_m3_v3(td->smtx, vec);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue