[Bf-blender-cvs] [1e23304fbc4] master: Cleanup: missing declaration warnings & spelling in comments

Campbell Barton noreply at git.blender.org
Fri Apr 29 03:54:44 CEST 2022


Commit: 1e23304fbc402b15d59a16aed400770aecd6a0dd
Author: Campbell Barton
Date:   Fri Apr 29 09:24:25 2022 +1000
Branches: master
https://developer.blender.org/rB1e23304fbc402b15d59a16aed400770aecd6a0dd

Cleanup: missing declaration warnings & spelling in comments

===================================================================

M	source/blender/blenkernel/intern/object.cc
M	source/blender/draw/engines/eevee_next/eevee_engine.cc
M	source/blender/editors/space_sequencer/sequencer_drag_drop.c
M	source/blender/editors/space_view3d/view3d_cursor_snap.c
M	source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc
index ddaae7a14d0..2a25d73ed87 100644
--- a/source/blender/blenkernel/intern/object.cc
+++ b/source/blender/blenkernel/intern/object.cc
@@ -1215,7 +1215,7 @@ static void object_asset_pre_save(void *asset_ptr, struct AssetMetaData *asset_d
   }
 }
 
-AssetTypeInfo AssetType_OB = {
+static AssetTypeInfo AssetType_OB = {
     /* pre_save_fn */ object_asset_pre_save,
 };
 
diff --git a/source/blender/draw/engines/eevee_next/eevee_engine.cc b/source/blender/draw/engines/eevee_next/eevee_engine.cc
index 390ab1f3e50..e3932c093b4 100644
--- a/source/blender/draw/engines/eevee_next/eevee_engine.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_engine.cc
@@ -11,6 +11,8 @@
 
 #include "DRW_render.h"
 
+#include "eevee_engine.h" /* Own include. */
+
 struct EEVEE_Data {
   DrawEngineType *engine_type;
   DRWViewportEmptyList *fbl;
diff --git a/source/blender/editors/space_sequencer/sequencer_drag_drop.c b/source/blender/editors/space_sequencer/sequencer_drag_drop.c
index 639d3651714..645c0dc9a1d 100644
--- a/source/blender/editors/space_sequencer/sequencer_drag_drop.c
+++ b/source/blender/editors/space_sequencer/sequencer_drag_drop.c
@@ -203,7 +203,7 @@ static void update_overlay_strip_poistion_data(bContext *C, const int mval[2])
   float end_frame = coords->start_frame + coords->strip_len;
 
   if (coords->use_snapping) {
-    /* Do snapping via the exsiting transform code. */
+    /* Do snapping via the existing transform code. */
     int snap_delta;
     float snap_frame;
     bool valid_snap;
diff --git a/source/blender/editors/space_view3d/view3d_cursor_snap.c b/source/blender/editors/space_view3d/view3d_cursor_snap.c
index 90c6bcaa8ec..96a193cc10d 100644
--- a/source/blender/editors/space_view3d/view3d_cursor_snap.c
+++ b/source/blender/editors/space_view3d/view3d_cursor_snap.c
@@ -561,7 +561,7 @@ static void v3d_cursor_snap_context_ensure(Scene *scene)
   }
 }
 
-static bool v3d_cursor_snap_calc_plane()
+static bool v3d_cursor_snap_calc_plane(void)
 {
   /* If any of the states require the plane, calculate the `plane_omat`. */
   LISTBASE_FOREACH (SnapStateIntern *, state, &g_data_intern.state_intern) {
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
index 96b342252c4..194583e71fe 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
@@ -30,7 +30,7 @@ namespace blender::io::obj {
 const int SMOOTH_GROUP_DISABLED = 0;
 const int SMOOTH_GROUP_DEFAULT = 1;
 
-const char *DEFORM_GROUP_DISABLED = "off";
+static const char *DEFORM_GROUP_DISABLED = "off";
 /* There is no deform group default name. Use what the user set in the UI. */
 
 /**
@@ -38,7 +38,7 @@ const char *DEFORM_GROUP_DISABLED = "off";
  * Once a material is assigned, it cannot be turned off; it can only be changed.
  * If a material name is not specified, a white material is used.
  * So an empty material name is written. */
-const char *MATERIAL_GROUP_DISABLED = "";
+static const char *MATERIAL_GROUP_DISABLED = "";
 
 void OBJWriter::write_vert_uv_normal_indices(FormatHandler<eFileType::OBJ> &fh,
                                              const IndexOffsets &offsets,



More information about the Bf-blender-cvs mailing list