diff options
| -rw-r--r-- | source/blender/blenkernel/intern/fluid.c | 8 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/seqcache.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/screen/area.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_script/script_edit.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 1 | ||||
| -rw-r--r-- | source/blender/nodes/composite/node_composite_tree.c | 3 | ||||
| -rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_keying.c | 1 |
7 files changed, 5 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index fc29b4aae32..934dc47cf81 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -3742,10 +3742,9 @@ static void BKE_fluid_modifier_processDomain(FluidModifierData *mmd, baking_mesh = mds->cache_flag & FLUID_DOMAIN_BAKING_MESH; baking_particles = mds->cache_flag & FLUID_DOMAIN_BAKING_PARTICLES; baking_guide = mds->cache_flag & FLUID_DOMAIN_BAKING_GUIDE; - bake_outdated = mds->cache_flag & - (FLUID_DOMAIN_OUTDATED_DATA | FLUID_DOMAIN_OUTDATED_NOISE | - FLUID_DOMAIN_OUTDATED_NOISE | FLUID_DOMAIN_OUTDATED_MESH | - FLUID_DOMAIN_OUTDATED_PARTICLES | FLUID_DOMAIN_OUTDATED_GUIDE); + bake_outdated = mds->cache_flag & (FLUID_DOMAIN_OUTDATED_DATA | FLUID_DOMAIN_OUTDATED_NOISE | + FLUID_DOMAIN_OUTDATED_MESH | FLUID_DOMAIN_OUTDATED_PARTICLES | + FLUID_DOMAIN_OUTDATED_GUIDE); bool resume_data, resume_noise, resume_mesh, resume_particles, resume_guide; resume_data = (!is_startframe) && (mds->cache_frame_pause_data == scene_framenr); @@ -4896,7 +4895,6 @@ void BKE_fluid_modifier_create_type_data(struct FluidModifierData *mmd) mmd->flow->type = FLUID_FLOW_TYPE_SMOKE; mmd->flow->behavior = FLUID_FLOW_BEHAVIOR_GEOMETRY; - mmd->flow->type = FLUID_FLOW_TYPE_SMOKE; mmd->flow->flags = FLUID_FLOW_ABSOLUTE | FLUID_FLOW_USE_PART_SIZE | FLUID_FLOW_USE_INFLOW; } else if (mmd->type & MOD_FLUID_TYPE_EFFEC) { diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c index 0846c6c90a6..aa4066b643f 100644 --- a/source/blender/blenkernel/intern/seqcache.c +++ b/source/blender/blenkernel/intern/seqcache.c @@ -682,7 +682,6 @@ void BKE_sequencer_cache_put( key->nfra = cfra - seq->start; key->type = type; key->cost = cost; - key->cache_owner = cache; key->link_prev = NULL; key->link_next = NULL; key->is_temp_cache = true; diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index b5cd6219c04..a083675ca01 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -3175,7 +3175,6 @@ static void metadata_draw_imbuf(ImBuf *ibuf, const rctf *rect, int fontid, const ctx.fontid = fontid; ctx.xmin = xmin; ctx.ymin = ymin; - ctx.vertical_offset = vertical_offset; ctx.current_y = ofs_y; ctx.vertical_offset = vertical_offset; IMB_metadata_foreach(ibuf, metadata_custom_draw_fields, &ctx); diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c index b9e97a19b82..d2f2411c538 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -67,12 +67,12 @@ void SCRIPT_OT_python_file_run(wmOperatorType *ot) ot->name = "Run Python File"; ot->description = "Run Python file"; ot->idname = "SCRIPT_OT_python_file_run"; - ot->flag = OPTYPE_UNDO; /* api callbacks */ ot->exec = run_pyfile_exec; ot->poll = ED_operator_areaactive; + /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL; RNA_def_string_file_path(ot->srna, "filepath", NULL, FILE_MAX, "Path", ""); diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index fccbdb63393..4623cc61d29 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -3048,7 +3048,6 @@ static void UV_OT_select_linked(wmOperatorType *ot) ot->name = "Select Linked"; ot->description = "Select all UV vertices linked to the active UV map"; ot->idname = "UV_OT_select_linked"; - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* api callbacks */ ot->exec = uv_select_linked_exec; diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index 93f2ba44a3a..8c224eb335f 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -101,9 +101,8 @@ static void localize(bNodeTree *localtree, bNodeTree *ntree) bNode *node = ntree->nodes.first; bNode *local_node = localtree->nodes.first; while (node != NULL) { - local_node->original = node; - /* ensure new user input gets handled ok */ + /* Ensure new user input gets handled ok. */ node->need_exec = 0; local_node->original = node; diff --git a/source/blender/nodes/composite/nodes/node_composite_keying.c b/source/blender/nodes/composite/nodes/node_composite_keying.c index 504126cb387..73e86a21ebe 100644 --- a/source/blender/nodes/composite/nodes/node_composite_keying.c +++ b/source/blender/nodes/composite/nodes/node_composite_keying.c @@ -57,7 +57,6 @@ static void node_composit_init_keying(bNodeTree *UNUSED(ntree), bNode *node) data->despill_factor = 1.0f; data->edge_kernel_radius = 3; data->edge_kernel_tolerance = 0.1f; - data->clip_white = 1.0f; data->clip_black = 0.0f; data->clip_white = 1.0f; |