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:
-rw-r--r--source/blender/blenkernel/intern/bpath_test.cc12
-rw-r--r--source/blender/compositor/operations/COM_CompositorOperation.cc2
-rw-r--r--source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc2
-rw-r--r--source/blender/editors/space_view3d/view3d_select.c4
-rw-r--r--source/blender/gpu/shaders/gpu_shader_depth_only_frag.glsl2
-rw-r--r--source/blender/render/intern/render_result.c2
6 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/bpath_test.cc b/source/blender/blenkernel/intern/bpath_test.cc
index ec1737276e1..a614f9b3954 100644
--- a/source/blender/blenkernel/intern/bpath_test.cc
+++ b/source/blender/blenkernel/intern/bpath_test.cc
@@ -77,7 +77,7 @@ class BPathTest : public testing::Test {
TEST_F(BPathTest, rebase_on_relative)
{
- // Test on relative paths, should be modified.
+ /* Test on relative paths, should be modified. */
Text *text = reinterpret_cast<Text *>(bmain->texts.first);
text->filepath = BLI_strdup(TEXT_PATH_RELATIVE);
@@ -92,7 +92,7 @@ TEST_F(BPathTest, rebase_on_relative)
TEST_F(BPathTest, rebase_on_absolute)
{
- // Test on absolute paths, should not be modified.
+ /* Test on absolute paths, should not be modified. */
Text *text = reinterpret_cast<Text *>(bmain->texts.first);
text->filepath = BLI_strdup(TEXT_PATH_ABSOLUTE);
@@ -115,9 +115,9 @@ TEST_F(BPathTest, convert_to_relative)
BKE_bpath_relative_convert(bmain, BASE_DIR, nullptr);
- // Already relative path should not be modified.
+ /* Already relative path should not be modified. */
EXPECT_STREQ(text->filepath, TEXT_PATH_RELATIVE);
- // Absolute path should be modified.
+ /* Absolute path should be modified. */
EXPECT_STREQ(movie_clip->filepath, MOVIECLIP_PATH_ABSOLUTE_MADE_RELATIVE);
}
@@ -131,9 +131,9 @@ TEST_F(BPathTest, convert_to_absolute)
BKE_bpath_absolute_convert(bmain, BASE_DIR, nullptr);
- // Relative path should be modified.
+ /* Relative path should be modified. */
EXPECT_STREQ(text->filepath, TEXT_PATH_RELATIVE_MADE_ABSOLUTE);
- // Already absolute path should not be modified.
+ /* Already absolute path should not be modified. */
EXPECT_STREQ(movie_clip->filepath, MOVIECLIP_PATH_ABSOLUTE);
}
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cc b/source/blender/compositor/operations/COM_CompositorOperation.cc
index 23520364bf0..e8b61ff229e 100644
--- a/source/blender/compositor/operations/COM_CompositorOperation.cc
+++ b/source/blender/compositor/operations/COM_CompositorOperation.cc
@@ -114,7 +114,7 @@ void CompositorOperation::deinit_execution()
void CompositorOperation::execute_region(rcti *rect, unsigned int /*tile_number*/)
{
- float color[8]; // 7 is enough
+ float color[8]; /* 7 is enough. */
float *buffer = output_buffer_;
float *zbuffer = depth_buffer_;
diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc
index b532ff0080e..4532f3c3710 100644
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc
@@ -134,7 +134,7 @@ static void extract_uv_init_subdiv(const DRWSubdivCache *subdiv_cache,
uint uv_layers;
if (!mesh_extract_uv_format_init(
&format, cache, &coarse_mesh->ldata, MR_EXTRACT_MESH, uv_layers)) {
- // TODO(kevindietrich): handle this more gracefully.
+ /* TODO(kevindietrich): handle this more gracefully. */
v_len = 1;
}
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 7292df8f2ec..da25c58e1be 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -1535,7 +1535,7 @@ void VIEW3D_OT_select_menu(wmOperatorType *ot)
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
- /* keyingset to use (dynamic enum) */
+ /* #Object.id.name to select (dynamic enum). */
prop = RNA_def_enum(ot->srna, "name", DummyRNA_NULL_items, 0, "Object Name", "");
RNA_def_enum_funcs(prop, object_select_menu_enum_itemf);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_ENUM_NO_TRANSLATE);
@@ -1713,7 +1713,7 @@ void VIEW3D_OT_bone_select_menu(wmOperatorType *ot)
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
- /* keyingset to use (dynamic enum) */
+ /* #Object.id.name to select (dynamic enum). */
prop = RNA_def_enum(ot->srna, "name", DummyRNA_NULL_items, 0, "Bone Name", "");
RNA_def_enum_funcs(prop, object_select_menu_enum_itemf);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_ENUM_NO_TRANSLATE);
diff --git a/source/blender/gpu/shaders/gpu_shader_depth_only_frag.glsl b/source/blender/gpu/shaders/gpu_shader_depth_only_frag.glsl
index 1b9fd48c77a..59efdd8d538 100644
--- a/source/blender/gpu/shaders/gpu_shader_depth_only_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_depth_only_frag.glsl
@@ -1,6 +1,6 @@
void main()
{
- // no color output, only depth (line below is implicit)
+ /* No color output, only depth (line below is implicit). */
// gl_FragDepth = gl_FragCoord.z;
}
diff --git a/source/blender/render/intern/render_result.c b/source/blender/render/intern/render_result.c
index a3ba8e2f02b..41c635e8481 100644
--- a/source/blender/render/intern/render_result.c
+++ b/source/blender/render/intern/render_result.c
@@ -663,7 +663,7 @@ static void *ml_addview_cb(void *base, const char *str)
static int order_render_passes(const void *a, const void *b)
{
- // 1 if a is after b
+ /* 1 if `a` is after `b`. */
RenderPass *rpa = (RenderPass *)a;
RenderPass *rpb = (RenderPass *)b;
unsigned int passtype_a = passtype_from_name(rpa->name);