diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 18 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_evaluate.c | 8 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/modifiers_bmesh.c | 20 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/particle_child.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 5 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 10 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_cycle.cc | 6 |
8 files changed, 42 insertions, 29 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 94924106542..918ce0da32f 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -106,7 +106,7 @@ class SEQUENCER_HT_header(Header): layout.prop(st, "preview_channels", expand=True, text="") layout.prop(st, "display_channel", text="Channel") - ed = context.scene.sequence_editor + ed = scene.sequence_editor if ed: row = layout.row(align=True) row.prop(ed, "show_overlay", text="", icon='GHOST_ENABLED') @@ -1076,7 +1076,7 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel): def draw(self, context): layout = self.layout - sequencer = context.scene.sequence_editor + ed = context.scene.sequence_editor strip = act_strip(context) @@ -1084,9 +1084,9 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel): proxy = strip.proxy flow = layout.column_flow() - flow.prop(sequencer, "proxy_storage", text="Storage") - if sequencer.proxy_storage == 'PROJECT': - flow.prop(sequencer, "proxy_dir", text="Directory") + flow.prop(ed, "proxy_storage", text="Storage") + if ed.proxy_storage == 'PROJECT': + flow.prop(ed, "proxy_dir", text="Directory") else: flow.prop(proxy, "use_proxy_custom_directory") flow.prop(proxy, "use_proxy_custom_file") @@ -1192,7 +1192,7 @@ class SEQUENCER_PT_modifiers(SequencerButtonsPanel, Panel): layout = self.layout strip = act_strip(context) - sequencer = context.scene.sequence_editor + ed = context.scene.sequence_editor layout.prop(strip, "use_linear_modifiers") @@ -1223,9 +1223,9 @@ class SEQUENCER_PT_modifiers(SequencerButtonsPanel, Panel): row.prop(mod, "input_mask_type", expand=True) if mod.input_mask_type == 'STRIP': - sequences_object = sequencer - if sequencer.meta_stack: - sequences_object = sequencer.meta_stack[-1] + sequences_object = ed + if ed.meta_stack: + sequences_object = ed.meta_stack[-1] box.prop_search(mod, "input_mask_strip", sequences_object, "sequences", text="Mask") else: box.prop(mod, "input_mask_id") diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 5ee3b9be5f9..ce5d4e3ea64 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -234,7 +234,7 @@ void BKE_mesh_normals_loop_split( const struct MVert *mverts, const int numVerts, struct MEdge *medges, const int numEdges, struct MLoop *mloops, float (*r_loopnors)[3], const int numLoops, struct MPoly *mpolys, const float (*polynors)[3], const int numPolys, - const bool use_split_normals, float split_angle, + const bool use_split_normals, const float split_angle, MLoopNorSpaceArray *r_lnors_spacearr, short (*clnors_data)[2], int *r_loop_to_poly); void BKE_mesh_normals_loop_custom_set( diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c index c7678be18c7..a3469ecd5cd 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.c +++ b/source/blender/blenkernel/intern/mesh_evaluate.c @@ -1264,7 +1264,7 @@ void BKE_mesh_normals_loop_split( const MVert *mverts, const int UNUSED(numVerts), MEdge *medges, const int numEdges, MLoop *mloops, float (*r_loopnors)[3], const int numLoops, MPoly *mpolys, const float (*polynors)[3], const int numPolys, - const bool use_split_normals, float split_angle, + const bool use_split_normals, const float split_angle, MLoopNorSpaceArray *r_lnors_spacearr, short (*clnors_data)[2], int *r_loop_to_poly) { /* For now this is not supported. If we do not use split normals, we do not generate anything fancy! */ @@ -1325,9 +1325,7 @@ void BKE_mesh_normals_loop_split( TIMEIT_START_AVERAGED(BKE_mesh_normals_loop_split); #endif - if (check_angle) { - split_angle = cosf(split_angle); - } + const float split_angle_cos = check_angle ? cosf(split_angle) : -1.0f; if (!r_lnors_spacearr && clnors_data) { /* We need to compute lnor spacearr if some custom lnor data are given to us! */ @@ -1371,7 +1369,7 @@ void BKE_mesh_normals_loop_split( */ if (!(mp->flag & ME_SMOOTH) || (medges[ml_curr->e].flag & ME_SHARP) || ml_curr->v == mloops[e2l[0]].v || - (check_angle && dot_v3v3(polynors[loop_to_poly[e2l[0]]], polynors[mp_index]) < split_angle)) + (check_angle && dot_v3v3(polynors[loop_to_poly[e2l[0]]], polynors[mp_index]) < split_angle_cos)) { /* Note: we are sure that loop != 0 here ;) */ e2l[1] = INDEX_INVALID; diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c index 0838630a6cb..a1172d3f110 100644 --- a/source/blender/blenkernel/intern/modifiers_bmesh.c +++ b/source/blender/blenkernel/intern/modifiers_bmesh.c @@ -62,7 +62,7 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm, const bool calc_face_normal) { MVert *mv, *mvert; MEdge *me, *medge; - MPoly /* *mpoly, */ /* UNUSED */ *mp; + MPoly *mpoly, *mp; MLoop *mloop; BMVert *v, **vtable; BMEdge *e, **etable; @@ -70,7 +70,6 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm, const bool calc_face_normal) BMFace *f; int i, j, totvert, totedge /* , totface */ /* UNUSED */ ; bool is_init = (bm->totvert == 0) && (bm->totedge == 0) && (bm->totface == 0); - bool is_cddm = (dm->type == DM_TYPE_CDDM); /* duplicate the arrays for non cddm */ char has_orig_htype = 0; int cd_vert_bweight_offset; @@ -106,7 +105,8 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm, const bool calc_face_normal) etable = MEM_mallocN(sizeof(*etable) * totedge, __func__); /*do verts*/ - mv = mvert = is_cddm ? dm->getVertArray(dm) : dm->dupVertArray(dm); + bool vert_allocated; + mv = mvert = DM_get_vert_array(dm, &vert_allocated);; for (i = 0; i < totvert; i++, mv++) { v = BM_vert_create(bm, mv->co, NULL, BM_CREATE_SKIP_CD); normal_short_to_float_v3(v->no, mv->no); @@ -124,11 +124,12 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm, const bool calc_face_normal) *orig_index = ORIGINDEX_NONE; } } - if (!is_cddm) MEM_freeN(mvert); + if (vert_allocated) MEM_freeN(mvert); if (is_init) bm->elem_index_dirty &= ~BM_VERT; /*do edges*/ - me = medge = is_cddm ? dm->getEdgeArray(dm) : dm->dupEdgeArray(dm); + bool edge_allocated; + me = medge = DM_get_edge_array(dm, &edge_allocated); for (i = 0; i < totedge; i++, me++) { //BLI_assert(BM_edge_exists(vtable[me->v1], vtable[me->v2]) == NULL); e = BM_edge_create(bm, vtable[me->v1], vtable[me->v2], NULL, BM_CREATE_SKIP_CD); @@ -147,13 +148,14 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm, const bool calc_face_normal) *orig_index = ORIGINDEX_NONE; } } - if (!is_cddm) MEM_freeN(medge); + if (edge_allocated) MEM_freeN(medge); if (is_init) bm->elem_index_dirty &= ~BM_EDGE; /* do faces */ /* note: i_alt is aligned with bmesh faces which may not always align with mpolys */ - mp = dm->getPolyArray(dm); - mloop = dm->getLoopArray(dm); + bool poly_allocated, loop_allocated; + mpoly = mp = DM_get_poly_array(dm, &poly_allocated); + mloop = DM_get_loop_array(dm, &loop_allocated); face_normals = (dm->dirty & DM_DIRTY_NORMALS) ? NULL : CustomData_get_layer(&dm->polyData, CD_NORMAL); for (i = 0; i < dm->numPolyData; i++, mp++) { BMLoop *l_iter; @@ -194,6 +196,8 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm, const bool calc_face_normal) *orig_index = ORIGINDEX_NONE; } } + if (poly_allocated) MEM_freeN(mpoly); + if (loop_allocated) MEM_freeN(mloop); if (is_init) bm->elem_index_dirty &= ~(BM_FACE | BM_LOOP); MEM_freeN(vtable); diff --git a/source/blender/blenkernel/intern/particle_child.c b/source/blender/blenkernel/intern/particle_child.c index 28bdde4e5f5..c2640e9b9e2 100644 --- a/source/blender/blenkernel/intern/particle_child.c +++ b/source/blender/blenkernel/intern/particle_child.c @@ -394,7 +394,7 @@ void psys_apply_child_modifiers(ParticleThreadContext *ctx, struct ListBase *mod get_strand_normal(ma, ornor, cur_length, (key-1)->vel); } - if (use_length_check && k > 1) { + if (use_length_check && k > 0) { float dvec[3]; /* check if path needs to be cut before actual end of data points */ if (!check_path_length(k, keys, key, max_length, step_length, &cur_length, dvec)) { diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 424f4269f3c..950f7ad9957 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -1680,6 +1680,11 @@ static bool seq_proxy_get_fname(Editing *ed, Sequence *seq, int cfra, int render else if (seq->type == SEQ_TYPE_IMAGE) { fname[0] = 0; } + else { + /* We could make a name here, except non-movie's don't generate proxies, + * cancel until other types of sequence strips are supported. */ + return false; + } BLI_path_append(dir, sizeof(dir), fname); BLI_path_abs(name, G.main->name); } diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 71b90641e02..0e2ac811a41 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -1207,17 +1207,17 @@ void BKE_texture_get_value( BKE_texture_get_value_ex(scene, texture, tex_co, texres, NULL, use_color_management); } -static void texture_nodes_fetch_images_for_pool(bNodeTree *ntree, struct ImagePool *pool) +static void texture_nodes_fetch_images_for_pool(Tex *texture, bNodeTree *ntree, struct ImagePool *pool) { for (bNode *node = ntree->nodes.first; node; node = node->next) { if (node->type == SH_NODE_TEX_IMAGE && node->id != NULL) { Image *image = (Image *)node->id; - BKE_image_pool_acquire_ibuf(image, NULL, pool); + BKE_image_pool_acquire_ibuf(image, &texture->iuser, pool); } else if (node->type == NODE_GROUP && node->id != NULL) { /* TODO(sergey): Do we need to control recursion here? */ bNodeTree *nested_tree = (bNodeTree *)node->id; - texture_nodes_fetch_images_for_pool(nested_tree, pool); + texture_nodes_fetch_images_for_pool(texture, nested_tree, pool); } } } @@ -1226,12 +1226,12 @@ static void texture_nodes_fetch_images_for_pool(bNodeTree *ntree, struct ImagePo void BKE_texture_fetch_images_for_pool(Tex *texture, struct ImagePool *pool) { if (texture->nodetree != NULL) { - texture_nodes_fetch_images_for_pool(texture->nodetree, pool); + texture_nodes_fetch_images_for_pool(texture, texture->nodetree, pool); } else { if (texture->type == TEX_IMAGE) { if (texture->ima != NULL) { - BKE_image_pool_acquire_ibuf(texture->ima, NULL, pool); + BKE_image_pool_acquire_ibuf(texture->ima, &texture->iuser, pool); } } } diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc index e30b9b44490..c9fa35bd551 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc @@ -87,6 +87,7 @@ void deg_graph_detect_cycles(Depsgraph *graph) BLI_Stack *traversal_stack = BLI_stack_new(sizeof(StackEntry), "DEG detect cycles stack"); + int num_cycles = 0; foreach (OperationDepsNode *node, graph->operations) { bool has_inlinks = false; foreach (DepsRelation *rel, node->inlinks) { @@ -136,6 +137,7 @@ void deg_graph_detect_cycles(Depsgraph *graph) } /* TODO(sergey): So called russian roulette cycle solver. */ rel->flag |= DEPSREL_FLAG_CYCLIC; + ++num_cycles; } else if (to_state == NODE_NOT_VISITED) { StackEntry new_entry; @@ -157,6 +159,10 @@ void deg_graph_detect_cycles(Depsgraph *graph) } BLI_stack_free(traversal_stack); + + if (num_cycles != 0) { + printf("Detected %d dependency cycles\n", num_cycles); + } } } // namespace DEG |