blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Merge branch 'blender-v2.90-release'

This commit is contained in:
Germano Cavalcante 2020-07-29 09:10:07 -03:00
parent 9c807325dd 84f7de432c
commit 18caaff149
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/editors/sculpt_paint/paint_image.c
View File

@ -1118,7 +1118,6 @@ void PAINT_OT_sample_color(wmOperatorType *ot)
void ED_object_texture_paint_mode_enter_ex(Main *bmain, Scene *scene, Object *ob)
{
bScreen *screen;
Image *ima = NULL;
ImagePaintSettings *imapaint = &scene->toolsettings->imapaint;
@ -1142,17 +1141,16 @@ void ED_object_texture_paint_mode_enter_ex(Main *bmain, Scene *scene, Object *ob
}
if (ima) {
for (screen = bmain->screens.first; screen; screen = screen->id.next) {
ScrArea *area;
for (area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl;
for (sl = area->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_IMAGE) {
SpaceImage *sima = (SpaceImage *)sl;
wmWindowManager *wm = bmain->wm.first;
for (wmWindow *win = wm->windows.first; win; win = win->next) {
const bScreen *screen = WM_window_get_active_screen(win);
for (ScrArea *area = screen->areabase.first; area; area = area->next) {
SpaceLink *sl = area->spacedata.first;
if (sl->spacetype == SPACE_IMAGE) {
SpaceImage *sima = (SpaceImage *)sl;
if (!sima->pin) {
ED_space_image_set(bmain, sima, NULL, ima, true);
}
if (!sima->pin) {
ED_space_image_set(bmain, sima, NULL, ima, true);
}
}
}

10
source/blender/editors/transform/transform_constraints.c
View File

@ -510,10 +510,12 @@ static void applyObjectConstraintVec(
else {
/* Specific TransData's space. */
copy_v3_v3(out, in);
mul_m3_v3(t->spacemtx_inv, out);
mul_m3_v3(td->axismtx, out);
if (t->flag & T_EDIT) {
mul_m3_v3(tc->mat3_unit, out);
if (t->con.mode & CON_APPLY) {
mul_m3_v3(t->spacemtx_inv, out);
mul_m3_v3(td->axismtx, out);
if (t->flag & T_EDIT) {
mul_m3_v3(tc->mat3_unit, out);
}
}
}
}