From 175e8fdc1e2e76bd1287f1aa93db4aa4cc44d3f9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 21 Nov 2017 16:33:36 +1100 Subject: Disable adding scene sequence strips into themselves D2923 by @spockTheGray w/ edits, see T52586 for details --- source/blender/editors/space_sequencer/sequencer_add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 46f212e3679..258cbdfaffd 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -361,7 +361,7 @@ void SEQUENCER_OT_scene_strip_add(struct wmOperatorType *ot) sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME); prop = RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, "Scene", ""); - RNA_def_enum_funcs(prop, RNA_scene_itemf); + RNA_def_enum_funcs(prop, RNA_scene_without_active_itemf); RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); ot->prop = prop; } -- cgit v1.2.3 From 7770c2ef8712ce0f3761fef305978c3275384834 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 21 Nov 2017 17:52:25 +0100 Subject: Removing OMP: get rid of last bit in /editors/ area. Just removing it, such cases are not bottlenecks and not worth the complication of doing real threading with own BLI_task. --- source/blender/editors/mesh/editmesh_utils.c | 1 - 1 file changed, 1 deletion(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index fc568a8b8ee..8baf5d05fe9 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -1240,7 +1240,6 @@ void EDBM_mesh_reveal(BMEditMesh *em, bool select) /* Use tag flag to remember what was hidden before all is revealed. * BM_ELEM_HIDDEN --> BM_ELEM_TAG */ -#pragma omp parallel for schedule(static) if (em->bm->totvert + em->bm->totedge + em->bm->totface >= BM_OMP_LIMIT) for (i = 0; i < 3; i++) { BMIter iter; BMElem *ele; -- cgit v1.2.3