Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-06-09 03:10:37 +0300
committerCampbell Barton <campbell@blender.org>2022-06-09 03:11:25 +0300
commit84906d47dc8ae7e0739865dbcba727f29c0632e9 (patch)
tree44a33bcf2a7491250b4e261b50bf8e359c9fb37d
parent8b8fbffeea21a7f063ee60ab95113e0f14e38555 (diff)
Cleanup: format
-rw-r--r--release/scripts/startup/bl_ui/properties_data_mesh.py1
-rw-r--r--source/blender/blenkernel/intern/unit.c7
-rw-r--r--source/blender/draw/intern/draw_manager_data.c3
-rw-r--r--source/blender/editors/animation/keyframing.c3
-rw-r--r--source/blender/editors/include/ED_keyframing.h4
-rw-r--r--source/blender/editors/sculpt_paint/curves_sculpt_ops.cc2
-rw-r--r--source/blender/editors/sculpt_paint/paint_vertex.cc2
-rw-r--r--source/blender/editors/space_image/space_image.c2
8 files changed, 14 insertions, 10 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index 764299e7ce3..6feddfe4d3b 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -678,6 +678,7 @@ class DATA_PT_vertex_colors(DATA_PT_mesh_attributes, Panel):
self.draw_attribute_warnings(context, layout)
+
classes = (
MESH_MT_vertex_group_context_menu,
MESH_MT_shape_key_context_menu,
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c
index 2520ce5179f..a187f267879 100644
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@ -467,10 +467,11 @@ static size_t unit_as_string(char *str,
* to replace 'scientific notation' in those cases. */
prec -= integer_digits_d(value_conv);
- /* Negative precision is used to disable stripping of zeroes. This reduces text jumping when changing values. */
+ /* Negative precision is used to disable stripping of zeroes.
+ * This reduces text jumping when changing values. */
if (prec < 0) {
- strip_skip = true;
- prec *= -1;
+ strip_skip = true;
+ prec *= -1;
}
CLAMP(prec, 0, 6);
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 7cdc42b5a81..188d9114cd7 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -1238,7 +1238,8 @@ static void drw_sculpt_generate_calls(DRWSculptCallbackData *scd)
&update_frustum,
&draw_frustum,
(void (*)(void *, GPU_PBVH_Buffers *))sculpt_draw_cb,
- scd, scd->use_mats);
+ scd,
+ scd->use_mats);
if (SCULPT_DEBUG_BUFFERS) {
int debug_node_nr = 0;
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 9200a730072..aa99a4e50c3 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -3119,7 +3119,8 @@ bool ED_autokeyframe_property(bContext *C,
fcu = BKE_fcurve_find_by_rna_context_ui(
C, ptr, prop, rnaindex_check, NULL, &action, &driven, &special);
- /* Only early out when we actually want an existing fcurve already (e.g. auto-keyframing from buttons). */
+ /* Only early out when we actually want an existing F-curve already
+ * (e.g. auto-keyframing from buttons). */
if (fcu == NULL && (driven || special || only_if_property_keyed)) {
return changed;
}
diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h
index 5f172dab969..a53042b70d6 100644
--- a/source/blender/editors/include/ED_keyframing.h
+++ b/source/blender/editors/include/ED_keyframing.h
@@ -662,8 +662,8 @@ bool ED_autokeyframe_pchan(struct bContext *C,
/**
* Use for auto-key-framing
* \param only_if_property_keyed: if true, auto-key-framing only creates keyframes on already keyed
- * properties. This is by design when using buttons. For other callers such as gizmos or VSE preview
- * transform, creating new animation/keyframes also on non-keyed properties is desired.
+ * properties. This is by design when using buttons. For other callers such as gizmos or VSE
+ * preview transform, creating new animation/keyframes also on non-keyed properties is desired.
*/
bool ED_autokeyframe_property(struct bContext *C,
struct Scene *scene,
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc
index f5f7726a7f8..5d6ffa67005 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc
@@ -17,8 +17,8 @@
#include "WM_api.h"
#include "WM_toolsystem.h"
-#include "ED_image.h"
#include "ED_curves_sculpt.h"
+#include "ED_image.h"
#include "ED_object.h"
#include "ED_screen.h"
#include "ED_view3d.h"
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.cc b/source/blender/editors/sculpt_paint/paint_vertex.cc
index cb054ea3319..8b548a89502 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.cc
+++ b/source/blender/editors/sculpt_paint/paint_vertex.cc
@@ -55,8 +55,8 @@
#include "WM_toolsystem.h"
#include "WM_types.h"
-#include "ED_image.h"
#include "ED_armature.h"
+#include "ED_image.h"
#include "ED_mesh.h"
#include "ED_object.h"
#include "ED_screen.h"
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index fa0b7d75a30..ab8143c5bf5 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -317,7 +317,7 @@ static void image_listener(const wmSpaceTypeListenerParams *params)
break;
case ND_MODE:
ED_paint_cursor_start(&params->scene->toolsettings->imapaint.paint,
- ED_image_tools_paint_poll);
+ ED_image_tools_paint_poll);
if (wmn->subtype == NS_EDITMODE_MESH) {
ED_area_tag_refresh(area);