[Bf-blender-cvs] [27dff3fbc1e] blender2.8: Merge branch 'master' into blender2.8
Brecht Van Lommel
noreply at git.blender.org
Thu Jan 18 01:36:24 CET 2018
Commit: 27dff3fbc1e74aa6613d68a0d9f9b0096fc86f6e
Author: Brecht Van Lommel
Date: Thu Jan 18 00:58:54 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB27dff3fbc1e74aa6613d68a0d9f9b0096fc86f6e
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/DerivedMesh.c
index 01340b97807,48edf55d76e..cfeca50a751
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@@ -634,10 -632,10 +634,10 @@@ void DM_generate_tangent_tessface_data(
for (int j = 0; j < ldata->totlayer; j++) {
if (ldata->layers[j].type == CD_TANGENT) {
CustomData_add_layer_named(fdata, CD_TANGENT, CD_CALLOC, NULL, totface, ldata->layers[j].name);
- CustomData_bmesh_update_active_layers(fdata, pdata, ldata);
+ CustomData_bmesh_update_active_layers(fdata, ldata);
if (!loopindex) {
- loopindex = MEM_mallocN(sizeof(*loopindex) * totface, __func__);
+ loopindex = MEM_malloc_arrayN(totface, sizeof(*loopindex), __func__);
for (mf_idx = 0, mf = mface; mf_idx < totface; mf_idx++, mf++) {
const int mf_len = mf->v4 ? 4 : 3;
unsigned int *ml_idx = loopindex[mf_idx];
diff --cc source/blender/blenkernel/intern/multires.c
index b6e3d048f0b,9c8fc9bfd0c..55f11604710
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@@ -438,12 -438,12 +438,12 @@@ int multiresModifier_reshapeFromDeformM
return 0;
/* Create DerivedMesh for deformation modifier */
- dm = get_multires_dm(scene, mmd, ob);
+ dm = get_multires_dm(eval_ctx, scene, mmd, ob);
numVerts = dm->getNumVerts(dm);
- deformedVerts = MEM_mallocN(sizeof(float[3]) * numVerts, "multiresReshape_deformVerts");
+ deformedVerts = MEM_malloc_arrayN(numVerts, sizeof(float[3]), "multiresReshape_deformVerts");
dm->getVertCos(dm, deformedVerts);
- mti->deformVerts(md, ob, dm, deformedVerts, numVerts, 0);
+ mti->deformVerts(md, eval_ctx, ob, dm, deformedVerts, numVerts, 0);
ndm = CDDM_copy(dm);
CDDM_apply_vert_coords(ndm, deformedVerts);
@@@ -2296,13 -2300,13 +2300,13 @@@ static void multires_apply_smat(const s
high_mmd.lvl = high_mmd.totlvl;
/* unscaled multires with applied displacement */
- subdm = get_multires_dm(scene, &high_mmd, ob);
+ subdm = get_multires_dm(eval_ctx, scene, &high_mmd, ob);
/* prepare scaled CDDM to create ccgDN */
- cddm = mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH);
+ cddm = mesh_get_derived_deform(eval_ctx, scene, ob, CD_MASK_BAREMESH);
totvert = cddm->getNumVerts(cddm);
- vertCos = MEM_mallocN(sizeof(*vertCos) * totvert, "multiresScale vertCos");
+ vertCos = MEM_malloc_arrayN(totvert, sizeof(*vertCos), "multiresScale vertCos");
cddm->getVertCos(cddm, vertCos);
for (i = 0; i < totvert; i++)
mul_m3_v3(smat, vertCos[i]);
diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
index d55f00ae7e4,b7dd05517cf..485586e844f
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
@@@ -213,7 -213,7 +213,7 @@@ bool DepsgraphRelationBuilder::is_same_
return false;
}
/* Check if this is actually a shape key datablock. */
-- if (GS(op_from->owner->owner->id->name) != ID_KE) {
++ if (GS(op_from->owner->owner->id_orig->name) != ID_KE) {
return false;
}
/* Different key data blocks. */
diff --cc source/blender/editors/mesh/editmesh_loopcut.c
index 3ab56f2ebcb,5d4f6242e4f..793e5609d31
--- a/source/blender/editors/mesh/editmesh_loopcut.c
+++ b/source/blender/editors/mesh/editmesh_loopcut.c
@@@ -762,10 -740,18 +762,18 @@@ static int loopcut_modal(bContext *C, w
handled = true;
break;
case MOUSEMOVE: /* mouse moved somewhere to select another loop */
- if (!has_numinput) {
+
+ /* This is normally disabled for all modal operators.
+ * This is an exception since mouse movement doesn't relate to numeric input.
+ *
+ * If numeric input changes we'll need to add this back see: D2973 */
+ #if 0
+ if (!has_numinput)
+ #endif
+ {
lcd->vc.mval[0] = event->mval[0];
lcd->vc.mval[1] = event->mval[1];
- loopcut_mouse_move(lcd, (int)lcd->cuts);
+ loopcut_mouse_move(&eval_ctx, lcd, (int)lcd->cuts);
ED_region_tag_redraw(lcd->ar);
handled = true;
diff --cc source/blender/editors/space_view3d/drawobject.c
index 222a335d758,83fb5f9df0e..3bc2481a608
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@@ -6115,10 -5207,10 +6115,10 @@@ static void draw_new_particle_system
create_cdata = 1;
break;
case PART_DRAW_LINE:
- tot_vec_size *= 2;
+ partsize *= 2;
break;
case PART_DRAW_BB:
- tot_vec_size *= 6; /* New OGL only understands tris, no choice here. */
- partsize *= 4;
++ partsize *= 6; /* New OGL only understands tris, no choice here. */
create_ndata = 1;
break;
}
@@@ -6625,10 -5760,13 +6626,10 @@@ static void draw_ptcache_edit(Scene *sc
UI_GetThemeColor3fv(TH_VERTEX, nosel_col);
/* draw paths */
- totkeys = (*edit->pathcache)->segments + 1;
+ const int totkeys = (*edit->pathcache)->segments + 1;
glEnable(GL_BLEND);
- float *pathcol = MEM_callocN(totkeys * 4 * sizeof(float), "particle path color data");
- pathcol = MEM_calloc_arrayN(totkeys, 4 * sizeof(float), "particle path color data");
-
- glEnableClientState(GL_VERTEX_ARRAY);
- glEnableClientState(GL_COLOR_ARRAY);
++ float *pathcol = MEM_calloc_arrayN(totkeys, 4 * sizeof(float), "particle path color data");
if (pset->brushtype == PE_BRUSH_WEIGHT)
glLineWidth(2.0f);
diff --cc source/blender/modifiers/intern/MOD_uvproject.c
index c9a842621b6,89ce50d076a..498dd2486f4
--- a/source/blender/modifiers/intern/MOD_uvproject.c
+++ b/source/blender/modifiers/intern/MOD_uvproject.c
@@@ -224,9 -245,13 +224,9 @@@ static DerivedMesh *uvprojectModifier_d
mloop_uv = CustomData_duplicate_referenced_layer_named(&dm->loopData,
CD_MLOOPUV, uvname, numLoops);
- /* can be NULL */
- mt = mtexpoly = CustomData_duplicate_referenced_layer_named(&dm->polyData,
- CD_MTEXPOLY, uvname, numPolys);
-
numVerts = dm->getNumVerts(dm);
- coords = MEM_mallocN(sizeof(*coords) * numVerts,
+ coords = MEM_malloc_arrayN(numVerts, sizeof(*coords),
"uvprojectModifier_do coords");
dm->getVertCos(dm, coords);
More information about the Bf-blender-cvs
mailing list