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:
Diffstat (limited to 'source')
-rw-r--r--source/blender/bmesh/operators/bmo_removedoubles.c2
-rw-r--r--source/blender/editors/armature/armature_add.c3
-rw-r--r--source/blender/editors/armature/pose_slide.c4
-rw-r--r--source/blender/editors/mesh/editmesh_tools.c2
-rw-r--r--source/blender/editors/sculpt_paint/paint_image_proj.c1
-rw-r--r--source/blender/editors/space_view3d/view3d_edit.c1
-rw-r--r--source/blender/gpu/intern/gpu_framebuffer_private.hh7
-rw-r--r--source/blender/gpu/opengl/gl_texture.hh8
-rw-r--r--source/blender/render/intern/pipeline.c2
9 files changed, 6 insertions, 24 deletions
diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c
index 02f17ea5d4a..361b10520da 100644
--- a/source/blender/bmesh/operators/bmo_removedoubles.c
+++ b/source/blender/bmesh/operators/bmo_removedoubles.c
@@ -387,7 +387,7 @@ void bmo_average_vert_facedata_exec(BMesh *bm, BMOperator *op)
BMOIter siter;
BMIter iter;
BMVert *v;
- BMLoop *l /* , *firstl = NULL */;
+ BMLoop *l;
CDBlockBytes min, max;
int i;
diff --git a/source/blender/editors/armature/armature_add.c b/source/blender/editors/armature/armature_add.c
index e538c20df6c..68fff1091af 100644
--- a/source/blender/editors/armature/armature_add.c
+++ b/source/blender/editors/armature/armature_add.c
@@ -122,9 +122,6 @@ EditBone *ED_armature_ebone_add_primitive(Object *obedit_arm, float length, bool
return bone;
}
-/* previously addvert_armature */
-/* the ctrl-click method */
-
/**
* Note this is already ported to multi-objects as it is.
* Since only the active bone is extruded even for single objects,
diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c
index d3d360aa636..d636f0d68af 100644
--- a/source/blender/editors/armature/pose_slide.c
+++ b/source/blender/editors/armature/pose_slide.c
@@ -689,7 +689,7 @@ static void pose_slide_rest_pose_apply(bContext *C, tPoseSlideOp *pso)
/* Not strictly a transform, but custom properties contribute
* to the pose produced in many rigs (e.g. the facial rigs used in Sintel). */
/* TODO Not implemented */
- // pose_slide_apply_props(pso, pfl, "[\""); /* dummy " for texteditor bugs */
+ // pose_slide_apply_props(pso, pfl, "[\"");
}
}
@@ -765,7 +765,7 @@ static void pose_slide_apply(bContext *C, tPoseSlideOp *pso)
if (ELEM(pso->channels, PS_TFM_ALL, PS_TFM_PROPS) && (pfl->oldprops)) {
/* Not strictly a transform, but custom properties contribute
* to the pose produced in many rigs (e.g. the facial rigs used in Sintel). */
- pose_slide_apply_props(pso, pfl, "[\""); /* dummy " for texteditor bugs */
+ pose_slide_apply_props(pso, pfl, "[\"");
}
}
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index d37fccc9f15..de37ddec885 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -3905,7 +3905,7 @@ static float bm_edge_seg_isect(const float sco_a[2],
x12 = mouse_path[i][0];
y12 = mouse_path[i][1];
- /* Perp. Distance from point to line */
+ /* Calculate the distance from point to line. */
if (m2 != MAXSLOPE) {
/* sqrt(m2 * m2 + 1); Only looking for change in sign. Skip extra math .*/
dist = (y12 - m2 * x12 - b2);
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 5330e85c732..7c13355c618 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -4338,7 +4338,6 @@ static void project_paint_prepare_all_faces(ProjPaintState *ps,
continue;
}
- /* tfbase here should be non-null! */
BLI_assert(mloopuv_base != NULL);
if (is_face_sel && tpage) {
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index fb527fa429f..2f8cd5a7517 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -3020,7 +3020,6 @@ void VIEW3D_OT_view_all(wmOperatorType *ot)
* Move & Zoom the view to fit selected contents.
* \{ */
-/* like a localview without local!, was centerview() in 2.4x */
static int viewselected_exec(bContext *C, wmOperator *op)
{
ARegion *region = CTX_wm_region(C);
diff --git a/source/blender/gpu/intern/gpu_framebuffer_private.hh b/source/blender/gpu/intern/gpu_framebuffer_private.hh
index 32c13cf13ff..d63d72cf4f7 100644
--- a/source/blender/gpu/intern/gpu_framebuffer_private.hh
+++ b/source/blender/gpu/intern/gpu_framebuffer_private.hh
@@ -20,12 +20,7 @@
/** \file
* \ingroup gpu
*
- * GPU Frame-buffer
- * - this is a wrapper for an OpenGL framebuffer object (FBO). in practice
- * multiple FBO's may be created.
- * - actual FBO creation & config is deferred until GPU_framebuffer_bind or
- * GPU_framebuffer_check_valid to allow creation & config while another
- * opengl context is bound (since FBOs are not shared between ogl contexts).
+ * Private frame buffer API.
*/
#pragma once
diff --git a/source/blender/gpu/opengl/gl_texture.hh b/source/blender/gpu/opengl/gl_texture.hh
index e686a7defca..65a211e12a3 100644
--- a/source/blender/gpu/opengl/gl_texture.hh
+++ b/source/blender/gpu/opengl/gl_texture.hh
@@ -1,4 +1,3 @@
-
/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -20,13 +19,6 @@
/** \file
* \ingroup gpu
- *
- * GPU Framebuffer
- * - this is a wrapper for an OpenGL framebuffer object (FBO). in practice
- * multiple FBO's may be created.
- * - actual FBO creation & config is deferred until GPU_framebuffer_bind or
- * GPU_framebuffer_check_valid to allow creation & config while another
- * opengl context is bound (since FBOs are not shared between ogl contexts).
*/
#pragma once
diff --git a/source/blender/render/intern/pipeline.c b/source/blender/render/intern/pipeline.c
index 99404c1a1f5..6e15066575c 100644
--- a/source/blender/render/intern/pipeline.c
+++ b/source/blender/render/intern/pipeline.c
@@ -2337,7 +2337,7 @@ static int do_write_image_or_movie(Render *re,
printf(" (Saving: %s)\n", name);
fputc('\n', stdout);
- fflush(stdout); /* needed for renderd !! (not anymore... (ton)) */
+ fflush(stdout);
return ok;
}