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
path: root/source
diff options
context:
space:
mode:
authorMonique <mdewanchand@atmind.nl>2022-09-10 18:10:04 +0300
committerMonique <mdewanchand@atmind.nl>2022-09-10 18:10:04 +0300
commit8798602c2efb8ea6249759dc4a8f3a078c86ccee (patch)
tree95d46334f53503bf3bcdf4fd092dd420b847d173 /source
parent65cc7c0af4e96fdc78cbf90f018f4d967bca1232 (diff)
Apply formatting, remove unneeded changes.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/BKE_collision.h1
-rw-r--r--source/blender/blenkernel/BKE_layer.h2
-rw-r--r--source/blender/draw/engines/overlay/overlay_edit_uv.c8
-rw-r--r--source/blender/editors/space_view3d/view3d_select.cc4
-rw-r--r--source/blender/editors/space_view3d/view3d_view.c12
5 files changed, 18 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h
index 291d76df4c8..b93babaaefa 100644
--- a/source/blender/blenkernel/BKE_collision.h
+++ b/source/blender/blenkernel/BKE_collision.h
@@ -17,7 +17,6 @@ struct Depsgraph;
struct MVert;
struct MVertTri;
struct Object;
-struct Scene;
////////////////////////////////////////
// used for collisions in collision.c
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index 4fd7868afeb..486095c79d7 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -438,7 +438,7 @@ void BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter);
{ \
Object *_instance; \
Base *_base; \
- UNUSED_VARS(scene);\
+ UNUSED_VARS(scene); \
for (_base = (Base *)(view_layer)->object_bases.first; _base; _base = _base->next) { \
_instance = _base->object;
diff --git a/source/blender/draw/engines/overlay/overlay_edit_uv.c b/source/blender/draw/engines/overlay/overlay_edit_uv.c
index 92cfdfa30c4..d2737d73333 100644
--- a/source/blender/draw/engines/overlay/overlay_edit_uv.c
+++ b/source/blender/draw/engines/overlay/overlay_edit_uv.c
@@ -114,10 +114,10 @@ void OVERLAY_edit_uv_init(OVERLAY_Data *vedata)
const bool show_modified_uvs = sima->flag & SI_DRAWSHADOW;
const bool is_tiled_image = image && (image->source == IMA_SRC_TILED);
const bool do_edges_only = (ts->uv_flag & UV_SYNC_SELECTION) ?
- /* NOTE: Ignore #SCE_SELECT_EDGE because a single selected edge
- * on the mesh may cause single UV vertices to be selected. */
- false :
- (ts->uv_selectmode == UV_SELECT_EDGE);
+ /* NOTE: Ignore #SCE_SELECT_EDGE because a single selected edge
+ * on the mesh may cause single UV vertices to be selected. */
+ false :
+ (ts->uv_selectmode == UV_SELECT_EDGE);
const bool do_faces = ((sima->flag & SI_NO_DRAWFACES) == 0);
const bool do_face_dots = (ts->uv_flag & UV_SYNC_SELECTION) ?
(ts->selectmode & SCE_SELECT_FACE) != 0 :
diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc
index 6c6b031472b..65631930d18 100644
--- a/source/blender/editors/space_view3d/view3d_select.cc
+++ b/source/blender/editors/space_view3d/view3d_select.cc
@@ -2527,6 +2527,7 @@ static bool ed_object_select_pick(bContext *C,
}
/* No menu, continue with selection. */
+
ViewLayer *view_layer = vc.view_layer;
/* Don't set when the context has no active object (hidden), see: T60807. */
const Base *oldbasact = vc.obact ? view_layer->basact : nullptr;
@@ -3437,7 +3438,8 @@ static bool do_mesh_box_select(ViewContext *vc,
}
if (ts->selectmode & SCE_SELECT_EDGE) {
/* Does both use_zbuf and non-use_zbuf versions (need screen cos for both) */
- struct BoxSelectUserData_ForMeshEdge cb_data {};
+ struct BoxSelectUserData_ForMeshEdge cb_data {
+ };
cb_data.data = &data;
cb_data.esel = use_zbuf ? esel : nullptr;
cb_data.backbuf_offset = use_zbuf ? DRW_select_buffer_context_offset_for_object_elem(
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 587ea5676c3..7c98ca8df74 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -1044,8 +1044,16 @@ static int localview_exec(bContext *C, wmOperator *op)
changed = true;
}
else {
- changed = view3d_localview_init(
- depsgraph, wm, win, bmain, scene, view_layer, area, frame_selected, smooth_viewtx, op->reports);
+ changed = view3d_localview_init(depsgraph,
+ wm,
+ win,
+ bmain,
+ scene,
+ view_layer,
+ area,
+ frame_selected,
+ smooth_viewtx,
+ op->reports);
}
if (changed) {