diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index 40f7a8c8c11..8344684ac64 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -848,7 +848,8 @@ void BlenderSync::sync_hair(BL::Depsgraph b_depsgraph, BL::Object b_ob, Hair *ha for (const SocketType &socket : new_hair.type->inputs) { /* Those sockets are updated in sync_object, so do not modify them. */ - if (socket.name == "use_motion_blur" || socket.name == "motion_steps" || socket.name == "used_shaders") { + if (socket.name == "use_motion_blur" || socket.name == "motion_steps" || + socket.name == "used_shaders") { continue; } hair->set_value(socket, new_hair, socket); diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index e87d87419d0..20637af96df 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -1065,7 +1065,8 @@ void BlenderSync::sync_mesh(BL::Depsgraph b_depsgraph, BL::Object b_ob, Mesh *me for (const SocketType &socket : new_mesh.type->inputs) { /* Those sockets are updated in sync_object, so do not modify them. */ - if (socket.name == "use_motion_blur" || socket.name == "motion_steps" || socket.name == "used_shaders") { + if (socket.name == "use_motion_blur" || socket.name == "motion_steps" || + socket.name == "used_shaders") { continue; } mesh->set_value(socket, new_mesh, socket); diff --git a/source/blender/blenlib/intern/noise.c b/source/blender/blenlib/intern/noise.c index 5052fcbcac9..82ceb36c0e1 100644 --- a/source/blender/blenlib/intern/noise.c +++ b/source/blender/blenlib/intern/noise.c @@ -1750,9 +1750,9 @@ float BLI_mg_VLNoise(float x, float y, float z, float distortion, int nbas1, int /* get a random vector and scale the randomization */ float rv[3] = { - rv[0] = noisefunc1(x + 13.5f, y + 13.5f, z + 13.5f) * distortion, - rv[1] = noisefunc1(x, y, z) * distortion, - rv[2] = noisefunc1(x - 13.5f, y - 13.5f, z - 13.5f) * distortion, + rv[0] = noisefunc1(x + 13.5f, y + 13.5f, z + 13.5f) * distortion, + rv[1] = noisefunc1(x, y, z) * distortion, + rv[2] = noisefunc1(x - 13.5f, y - 13.5f, z - 13.5f) * distortion, }; return noisefunc2(x + rv[0], y + rv[1], z + rv[2]); /* distorted-domain noise */ diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 336e6e75659..fbe71900915 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -349,7 +349,6 @@ typedef enum { DRW_STATE_LOGIC_INVERT = (10 << 11), DRW_STATE_BLEND_ALPHA_UNDER_PREMUL = (11 << 11), - DRW_STATE_IN_FRONT_SELECT = (1 << 27), DRW_STATE_SHADOW_OFFSET = (1 << 28), DRW_STATE_CLIP_PLANES = (1 << 29), diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 8b4b040b550..5e2a8be8db0 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -284,7 +284,9 @@ static void constraint_snap_plane_to_edge(const TransInfo *t, const float plane[ * Snap to the nearest point between the snap point and the line that * intersects the face plane with the constraint plane. */ -static void UNUSED_FUNCTION(constraint_snap_plane_to_face(const TransInfo *t, const float plane[4], float r_out[3])) +static void UNUSED_FUNCTION(constraint_snap_plane_to_face(const TransInfo *t, + const float plane[4], + float r_out[3])) { float face_plane[4], isect_orig[3], isect_dir[3]; const float *face_snap_point = t->tsnap.snapPoint; diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 15a7037b14d..6a6cf2f8fc9 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2794,7 +2794,8 @@ static void rna_def_view3d_cursor(BlenderRNA *brna) prop = RNA_def_property(srna, "matrix", PROP_FLOAT, PROP_MATRIX); RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4); RNA_def_property_flag(prop, PROP_THICK_WRAP); /* no reference to original data */ - RNA_def_property_ui_text(prop, "Transform Matrix", "Matrix combining location and rotation of the cursor"); + RNA_def_property_ui_text( + prop, "Transform Matrix", "Matrix combining location and rotation of the cursor"); RNA_def_property_float_funcs( prop, "rna_View3DCursor_matrix_get", "rna_View3DCursor_matrix_set", NULL); } diff --git a/source/blender/python/intern/bpy_app_translations.c b/source/blender/python/intern/bpy_app_translations.c index 945e7b5fd1d..30e0d94939d 100644 --- a/source/blender/python/intern/bpy_app_translations.c +++ b/source/blender/python/intern/bpy_app_translations.c @@ -420,9 +420,9 @@ static BLT_i18n_contexts_descriptor _contexts[] = BLT_I18NCONTEXTS_DESC; static PyStructSequence_Field app_translations_contexts_fields[ARRAY_SIZE(_contexts)] = {{NULL}}; static PyStructSequence_Desc app_translations_contexts_desc = { - "bpy.app.translations.contexts", /* name */ + "bpy.app.translations.contexts", /* name */ "This named tuple contains all predefined translation contexts", /* doc */ - app_translations_contexts_fields, /* fields */ + app_translations_contexts_fields, /* fields */ ARRAY_SIZE(app_translations_contexts_fields) - 1, }; diff --git a/source/blender/python/intern/bpy_utils_units.c b/source/blender/python/intern/bpy_utils_units.c index 29bc9e31aa3..b460ef5e0c0 100644 --- a/source/blender/python/intern/bpy_utils_units.c +++ b/source/blender/python/intern/bpy_utils_units.c @@ -73,15 +73,15 @@ static PyStructSequence_Field bpyunits_systems_fields[ARRAY_SIZE(bpyunits_usyste static PyStructSequence_Field bpyunits_categories_fields[ARRAY_SIZE(bpyunits_ucategorie_items)]; static PyStructSequence_Desc bpyunits_systems_desc = { - "bpy.utils.units.systems", /* name */ + "bpy.utils.units.systems", /* name */ "This named tuple contains all predefined unit systems", /* doc */ - bpyunits_systems_fields, /* fields */ + bpyunits_systems_fields, /* fields */ ARRAY_SIZE(bpyunits_systems_fields) - 1, }; static PyStructSequence_Desc bpyunits_categories_desc = { - "bpy.utils.units.categories", /* name */ + "bpy.utils.units.categories", /* name */ "This named tuple contains all predefined unit names", /* doc */ - bpyunits_categories_fields, /* fields */ + bpyunits_categories_fields, /* fields */ ARRAY_SIZE(bpyunits_categories_fields) - 1, };