blender
/
blender
134
398
Fork 579
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2017-10-14 19:29:11 +11:00
parent 0e35c900d8 49f4ac17bf
commit a1bb2ae0d7
5 changed files with 64 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
release/scripts/presets/render/4K_DCI_2160p.py Normal file
View File

@ -0,0 +1,8 @@
import bpy
bpy.context.scene.render.resolution_x = 4096
bpy.context.scene.render.resolution_y = 2160
bpy.context.scene.render.resolution_percentage = 100
bpy.context.scene.render.pixel_aspect_x = 1
bpy.context.scene.render.pixel_aspect_y = 1
bpy.context.scene.render.fps = 24
bpy.context.scene.render.fps_base = 1

8
release/scripts/presets/render/4K_UW_1600p.py Normal file
View File

@ -0,0 +1,8 @@
import bpy
bpy.context.scene.render.resolution_x = 3840
bpy.context.scene.render.resolution_y = 1600
bpy.context.scene.render.resolution_percentage = 100
bpy.context.scene.render.pixel_aspect_x = 1
bpy.context.scene.render.pixel_aspect_y = 1
bpy.context.scene.render.fps = 24
bpy.context.scene.render.fps_base = 1

8
release/scripts/presets/render/4k_UHDTV_2160p.py Normal file
View File

@ -0,0 +1,8 @@
import bpy
bpy.context.scene.render.resolution_x = 3840
bpy.context.scene.render.resolution_y = 2160
bpy.context.scene.render.resolution_percentage = 100
bpy.context.scene.render.pixel_aspect_x = 1
bpy.context.scene.render.pixel_aspect_y = 1
bpy.context.scene.render.fps = 24
bpy.context.scene.render.fps_base = 1

22
source/blender/editors/curve/editcurve.c
View File

@ -4795,13 +4795,13 @@ static int ed_editcurve_addvert(Curve *cu, EditNurb *editnurb, const float locat
{
Nurb *nu;
float minmax[2][3];
float center[3];
float temp[3];
bool nu_has_select = false;
uint verts_len;
bool changed = false;
INIT_MINMAX(minmax[0], minmax[1]);
zero_v3(center);
verts_len = 0;
for (nu = editnurb->nurbs.first; nu; nu = nu->next) {
int i;
@ -4810,8 +4810,8 @@ static int ed_editcurve_addvert(Curve *cu, EditNurb *editnurb, const float locat
for (i = 0, bezt = nu->bezt; i < nu->pntsu; i++, bezt++) {
if (BEZT_ISSEL_ANY_HIDDENHANDLES(cu, bezt)) {
minmax_v3v3_v3(UNPACK2(minmax), bezt->vec[1]);
nu_has_select = true;
add_v3_v3(center, bezt->vec[1]);
verts_len += 1;
}
}
}
@ -4820,18 +4820,18 @@ static int ed_editcurve_addvert(Curve *cu, EditNurb *editnurb, const float locat
for (i = 0, bp = nu->bp; i < nu->pntsu; i++, bp++) {
if (bp->f1 & SELECT) {
minmax_v3v3_v3(UNPACK2(minmax), bp->vec);
nu_has_select = true;
add_v3_v3(center, bp->vec);
verts_len += 1;
}
}
}
}
if (nu_has_select && ed_editcurve_extrude(cu, editnurb)) {
float ofs[3], center[3];
if (verts_len && ed_editcurve_extrude(cu, editnurb)) {
float ofs[3];
int i;
mid_v3_v3v3(center, minmax[0], minmax[1]);
mul_v3_fl(center, 1.0f / (float)verts_len);
sub_v3_v3v3(ofs, location_init, center);
if ((cu->flag & CU_3D) == 0) {

54
source/blender/editors/mesh/editmesh_extrude.c
View File

@ -518,40 +518,46 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, const w
ViewContext vc;
BMVert *v1;
BMIter iter;
float min[3], max[3];
bool done = false;
float center[3];
uint verts_len;
bool use_proj;
em_setup_viewcontext(C, &vc);
invert_m4_m4(vc.obedit->imat, vc.obedit->obmat);
ED_view3d_init_mats_rv3d(vc.obedit, vc.rv3d);
use_proj = ((vc.scene->toolsettings->snap_flag & SCE_SNAP) &&
(vc.scene->toolsettings->snap_mode == SCE_SNAP_MODE_FACE));
INIT_MINMAX(min, max);
zero_v3(center);
verts_len = 0;
BM_ITER_MESH (v1, &iter, vc.em->bm, BM_VERTS_OF_MESH) {
if (BM_elem_flag_test(v1, BM_ELEM_SELECT)) {
minmax_v3v3_v3(min, max, v1->co);
done = true;
add_v3_v3(center, v1->co);
verts_len += 1;
}
}
/* call extrude? */
if (done) {
if (verts_len != 0) {
const char extrude_htype = edbm_extrude_htype_from_em_select(vc.em);
const bool rot_src = RNA_boolean_get(op->ptr, "rotate_source");
BMEdge *eed;
float vec[3], cent[3], mat[3][3];
float mat[3][3];
float vec[3], ofs[3];
float nor[3] = {0.0, 0.0, 0.0};
/* 2D normal calc */
const float mval_f[2] = {(float)event->mval[0],
(float)event->mval[1]};
mul_v3_fl(center, 1.0f / (float)verts_len);
/* check for edges that are half selected, use for rotation */
done = false;
bool done = false;
BM_ITER_MESH (eed, &iter, vc.em->bm, BM_EDGES_OF_MESH) {
if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
float co1[2], co2[2];
@ -592,21 +598,20 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, const w
}
/* center */
mid_v3_v3v3(cent, min, max);
copy_v3_v3(min, cent);
copy_v3_v3(ofs, center);
mul_m4_v3(vc.obedit->obmat, min); /* view space */
ED_view3d_win_to_3d_int(vc.v3d, vc.ar, min, event->mval, min);
mul_m4_v3(vc.obedit->imat, min); // back in object space
mul_m4_v3(vc.obedit->obmat, ofs); /* view space */
ED_view3d_win_to_3d_int(vc.v3d, vc.ar, ofs, event->mval, ofs);
mul_m4_v3(vc.obedit->imat, ofs); // back in object space
sub_v3_v3(min, cent);
sub_v3_v3(ofs, center);
/* calculate rotation */
unit_m3(mat);
if (done) {
float angle;
normalize_v3_v3(vec, min);
normalize_v3_v3(vec, ofs);
angle = angle_normalized_v3v3(vec, nor);
@ -626,7 +631,7 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, const w
if (rot_src) {
EDBM_op_callf(vc.em, op, "rotate verts=%hv cent=%v matrix=%m3",
BM_ELEM_SELECT, cent, mat);
BM_ELEM_SELECT, center, mat);
/* also project the source, for retopo workflow */
if (use_proj)
@ -635,22 +640,21 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, const w
edbm_extrude_ex(vc.obedit, vc.em, extrude_htype, BM_ELEM_SELECT, true, true);
EDBM_op_callf(vc.em, op, "rotate verts=%hv cent=%v matrix=%m3",
BM_ELEM_SELECT, cent, mat);
BM_ELEM_SELECT, center, mat);
EDBM_op_callf(vc.em, op, "translate verts=%hv vec=%v",
BM_ELEM_SELECT, min);
BM_ELEM_SELECT, ofs);
}
else {
const float *curs = ED_view3d_cursor3d_get(vc.scene, vc.v3d);
const float *cursor = ED_view3d_cursor3d_get(vc.scene, vc.v3d);
BMOperator bmop;
BMOIter oiter;
copy_v3_v3(min, curs);
ED_view3d_win_to_3d_int(vc.v3d, vc.ar, min, event->mval, min);
invert_m4_m4(vc.obedit->imat, vc.obedit->obmat);
mul_m4_v3(vc.obedit->imat, min); // back in object space
copy_v3_v3(center, cursor);
ED_view3d_win_to_3d_int(vc.v3d, vc.ar, center, event->mval, center);
mul_m4_v3(vc.obedit->imat, center); // back in object space
EDBM_op_init(vc.em, &bmop, op, "create_vert co=%v", min);
EDBM_op_init(vc.em, &bmop, op, "create_vert co=%v", center);
BMO_op_exec(vc.em->bm, &bmop);
BMO_ITER (v1, &oiter, bmop.slots_out, "vert.out", BM_VERT) {