diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index 9b140705c2c..16162d30184 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -996,8 +996,8 @@ void blo_do_versions_250(FileData *fd, Library *UNUSED(lib), Main *bmain) * to the evaluated #Mesh, so here we ensure that the basis * shape key is always set in the mesh coordinates. */ for (me = bmain->meshes.first; me; me = me->id.next) { - if ((key = blo_do_versions_newlibadr(fd, &me->id, ID_IS_LINKED(me), me->key)) && - key->refkey) { + if ((key = blo_do_versions_newlibadr(fd, &me->id, ID_IS_LINKED(me), me->key)) && key->refkey) + { data = key->refkey->data; tot = MIN2(me->totvert, key->refkey->totelem); MVert *verts = (MVert *)CustomData_get_layer_for_write(&me->vdata, CD_MVERT, me->totvert); @@ -1008,8 +1008,8 @@ void blo_do_versions_250(FileData *fd, Library *UNUSED(lib), Main *bmain) } for (lt = bmain->lattices.first; lt; lt = lt->id.next) { - if ((key = blo_do_versions_newlibadr(fd, <->id, ID_IS_LINKED(lt), lt->key)) && - key->refkey) { + if ((key = blo_do_versions_newlibadr(fd, <->id, ID_IS_LINKED(lt), lt->key)) && key->refkey) + { data = key->refkey->data; tot = MIN2(lt->pntsu * lt->pntsv * lt->pntsw, key->refkey->totelem); @@ -1020,8 +1020,8 @@ void blo_do_versions_250(FileData *fd, Library *UNUSED(lib), Main *bmain) } for (cu = bmain->curves.first; cu; cu = cu->id.next) { - if ((key = blo_do_versions_newlibadr(fd, &cu->id, ID_IS_LINKED(cu), cu->key)) && - key->refkey) { + if ((key = blo_do_versions_newlibadr(fd, &cu->id, ID_IS_LINKED(cu), cu->key)) && key->refkey) + { data = key->refkey->data; for (nu = cu->nurb.first; nu; nu = nu->next) { diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 77725b5bd0d..0b3b213b0a9 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -928,7 +928,8 @@ int transformEvent(TransInfo *t, const wmEvent *event) /* Handle modal numinput events first, if already activated. */ if (!is_navigating && ((event->val == KM_PRESS) || (event->type == EVT_MODAL_MAP)) && - hasNumInput(&t->num) && handleNumInput(t->context, &(t->num), event)) { + hasNumInput(&t->num) && handleNumInput(t->context, &(t->num), event)) + { t->redraw |= TREDRAW_HARD; handled = true; } diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 3d3ad5a2dd5..4873b455fe4 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -662,7 +662,8 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve if (op && (t->flag & T_MODAL) && !(t->flag & T_RELEASE_CONFIRM) && (prop = RNA_struct_find_property(op->ptr, "allow_navigation")) && - RNA_property_boolean_get(op->ptr, prop)) { + RNA_property_boolean_get(op->ptr, prop)) + { t->vod = ED_view3d_navigation_init(C); } diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 3f3d4edd494..645f45656c1 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -2432,7 +2432,6 @@ typedef enum GeometryNodeDeleteGeometryMode { GEO_NODE_DELETE_GEOMETRY_MODE_ONLY_FACE = 2, } GeometryNodeDeleteGeometryMode; - typedef enum GeometryNodeScaleElementsMode { GEO_NODE_SCALE_ELEMENTS_UNIFORM = 0, GEO_NODE_SCALE_ELEMENTS_SINGLE_AXIS = 1, diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 603df37dbf9..6af63a01b29 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -11238,7 +11238,6 @@ static void def_geo_viewer(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } - static void def_geo_evaluate_at_index(StructRNA *srna) { PropertyRNA *prop;