Commit: e7fd6c8f30cd1161496831859da403eaa34fdf89
Author: Campbell Barton
Date: Tue Mar 19 15:17:46 2019 +1100
Branches: master
https://developer.blender.org/rBe7fd6c8f30cd1161496831859da403eaa34fdf89
Cleanup: comment blocks
===================================================================
M doc/doxygen/doxygen.intern.h
M intern/ghost/intern/GHOST_Context.h
M intern/ghost/intern/GHOST_SystemCocoa.mm
M intern/ghost/intern/GHOST_SystemWin32.h
M intern/iksolver/extern/IK_solver.h
M intern/string/STR_String.h
M source/blender/blenfont/intern/blf_font.c
M source/blender/blenkernel/intern/appdir.c
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/cloth.c
M source/blender/blenkernel/intern/effect.c
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/blenkernel/intern/multires.c
M source/blender/blenkernel/intern/object_update.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenlib/BLI_math_matrix.h
M source/blender/blenlib/BLI_mempool.h
M source/blender/blenlib/BLI_rand.h
M source/blender/blenlib/intern/math_rotation.c
M source/blender/blenlib/intern/string_utf8.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/collada/ArmatureImporter.cpp
M source/blender/collada/MeshImporter.cpp
M source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
M source/blender/depsgraph/DEG_depsgraph_query.h
M source/blender/draw/engines/eevee/eevee_bloom.c
M source/blender/draw/engines/eevee/eevee_depth_of_field.c
M source/blender/draw/engines/eevee/eevee_effects.c
M source/blender/draw/engines/eevee/eevee_lights.c
M source/blender/draw/engines/eevee/eevee_materials.c
M source/blender/draw/engines/eevee/eevee_occlusion.c
M source/blender/draw/engines/eevee/eevee_volumes.c
M source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl
M source/blender/draw/engines/eevee/shaders/effect_dof_vert.glsl
M
source/blender/draw/engines/eevee/shaders/effect_downsample_cube_frag.glsl
M source/blender/draw/engines/eevee/shaders/effect_downsample_frag.glsl
M source/blender/draw/engines/eevee/shaders/effect_gtao_frag.glsl
M source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl
M
source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_frag.glsl
M source/blender/draw/engines/eevee/shaders/ltc_lib.glsl
M source/blender/draw/engines/eevee/shaders/volumetric_vert.glsl
M
source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl
M source/blender/draw/engines/workbench/workbench_deferred.c
M source/blender/draw/engines/workbench/workbench_effect_dof.c
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/draw/intern/draw_hair.c
M source/blender/draw/intern/draw_instance_data.c
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/intern/draw_manager.h
M source/blender/draw/intern/draw_manager_data.c
M source/blender/draw/intern/draw_manager_exec.c
M source/blender/draw/modes/shaders/common_hair_lib.glsl
M source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl
M source/blender/draw/modes/shaders/object_grid_frag.glsl
M source/blender/editors/armature/pose_slide.c
M source/blender/editors/armature/pose_utils.c
M source/blender/editors/gpencil/annotate_paint.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/object/object_select.c
M source/blender/editors/space_view3d/view3d_snap.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
M source/blender/gpu/GPU_framebuffer.h
M source/blender/gpu/GPU_vertex_format.h
M source/blender/gpu/intern/gpu_codegen.c
M source/blender/gpu/intern/gpu_framebuffer.c
M source/blender/gpu/intern/gpu_texture.c
M source/blender/gpu/shaders/gpu_shader_2D_image_multi_rect_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_image_rect_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl
M source/blender/makesdna/DNA_ID.h
M source/blender/makesdna/DNA_meshdata_types.h
M source/blender/makesrna/intern/rna_ID.c
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_key.c
M source/blender/python/gpu/gpu_py_offscreen.c
M source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
diff --git a/doc/doxygen/doxygen.intern.h b/doc/doxygen/doxygen.intern.h
index 777f35ef50a..8e51cb01df0 100644
--- a/doc/doxygen/doxygen.intern.h
+++ b/doc/doxygen/doxygen.intern.h
@@ -71,7 +71,7 @@
* \ingroup audaspace
*/
/** \defgroup audsrc Audaspace SRC
-
+ *
* \ingroup audaspace
*/
/** \defgroup audffmpeg Audaspace FFMpeg
@@ -91,4 +91,3 @@
* \ingroup intern GUI
* \ref GHOSTPage
*/
-
diff --git a/intern/ghost/intern/GHOST_Context.h
b/intern/ghost/intern/GHOST_Context.h
index dec6deb946a..decafd10b75 100644
--- a/intern/ghost/intern/GHOST_Context.h
+++ b/intern/ghost/intern/GHOST_Context.h
@@ -118,7 +118,7 @@ public:
return m_stereoVisual;
}
- /** Number of samples used in anti-aliasing, set to 0 if no AA **/
+ /** Number of samples used in anti-aliasing, set to 0 if no AA */
inline GHOST_TUns16 getNumOfAASamples() const {
return m_numOfAASamples;
}
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm
b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 916e219fa97..b847cace57c 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -277,7 +277,7 @@ extern "C" int GHOST_HACK_getFirstFile(char
buf[FIRSTFILEBUFLG])
/**
* CocoaAppDelegate
* ObjC object to capture applicationShouldTerminate, and send quit event
- **/
+ */
@interface CocoaAppDelegate : NSObject <NSApplicationDelegate> {
GHOST_SystemCocoa *systemCocoa;
diff --git a/intern/ghost/intern/GHOST_SystemWin32.h
b/intern/ghost/intern/GHOST_SystemWin32.h
index 48934feaeda..edf7c3fb695 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.h
+++ b/intern/ghost/intern/GHOST_SystemWin32.h
@@ -382,7 +382,7 @@ protected:
/** Console status */
int m_consoleStatus;
- /** Wheel delta accumulator **/
+ /** Wheel delta accumulator */
int m_wheelDeltaAccum;
};
diff --git a/intern/iksolver/extern/IK_solver.h
b/intern/iksolver/extern/IK_solver.h
index a1d36c024a3..9af6cc6988f 100644
--- a/intern/iksolver/extern/IK_solver.h
+++ b/intern/iksolver/extern/IK_solver.h
@@ -24,35 +24,32 @@
/**
-
- * Copyright (C) 2001 NaN Technologies B.V.
- *
* \page IK - Blender inverse kinematics module.
*
* \section about About the IK module
*
- * This module allows you to create segments and form them into
- * tree. You can then define a goal points that the end of a given
+ * This module allows you to create segments and form them into
+ * tree. You can then define a goal points that the end of a given
* segment should attempt to reach - an inverse kinematic problem.
* This module will then modify the segments in the tree in order
* to get the as near as possible to the goal. This solver uses an
* inverse jacobian method to find a solution.
- *
+ *
* \section issues Known issues with this IK solver.
*
* - There is currently no support for joint constraints in the
* solver. This is within the realms of possibility - please ask
* if this functionality is required.
* - The solver is slow, inverse jacobian methods in general give
- * 'smooth' solutions and the method is also very flexible, it
- * does not rely on specific angle parameterization and can be
- * extended to deal with different joint types and joint
- * constraints. However it is not suitable for real time use.
+ * 'smooth' solutions and the method is also very flexible, it
+ * does not rely on specific angle parameterization and can be
+ * extended to deal with different joint types and joint
+ * constraints. However it is not suitable for real time use.
* Other algorithms exist which are more suitable for real-time
- * applications, please ask if this functionality is required.
- *
+ * applications, please ask if this functionality is required.
+ *
* \section dependencies Dependencies
- *
+ *
* This module only depends on Moto.
*/
@@ -76,25 +73,25 @@ extern "C" {
*/
/**
- * IK_Segment defines a single segment of an IK tree.
+ * IK_Segment defines a single segment of an IK tree.
* - Individual segments are always defined in local coordinates.
- * - The segment is assumed to be oriented in the local
+ * - The segment is assumed to be oriented in the local
* y-direction.
- * - start is the start of the segment relative to the end
+ * - start is the start of the segment relative to the end
* of the parent segment.
* - rest_basis is a column major matrix defineding the rest
* position (w.r.t. which the limits are defined), must
* be a pure rotation
* - basis is a column major matrix defining the current change
* from the rest basis, must be a pure rotation
- * - length is the length of the bone.
+ * - length is the length of the bone.
*
* - basis_change and translation_change respectively define
* the change in rotation or translation. basis_change is a
* column major 3x3 matrix.
*
* The local transformation is then defined as:
- * start * rest_basis * basis * basis_change * translation_change *
translate(0,length,0)
+ * start * rest_basis * basis * basis_change * translation_change *
translate(0,length,0)
*/
typedef void IK_Segment;
@@ -130,16 +127,16 @@ extern void IK_GetTranslationChange(IK_Segment *seg,
float *translation_change);
/**
* An IK_Solver must be created to be able to execute the solver.
- *
+ *
* An arbitray number of goals can be created, stating that a given
* end effector must have a given position or rotation. If multiple
* goals are specified, they can be weighted (range 0..1) to get
* some control over their importance.
- *
+ *
* IK_Solve will execute the solver, that will run until either the
* system converges, or a maximum number of iterations is reached.
* It returns 1 if the system converged, 0 otherwise.
- */
+ */
typedef void IK_Solver;
@@ -162,4 +159,3 @@ int IK_Solve(IK_Solver *solver, float tolerance, int
max_iterations);
#endif
#endif // __IK_SOLVER_H__
-
diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h
index 2afcd225fe5..27db035429c 100644
--- a/intern/string/STR_String.h
+++ b/intern/string/STR_String.h
@@ -21,14 +21,6 @@
* \ingroup string
*/
-
-/**
-
- * Copyright (C) 2001 NaN Technologies B.V.
- * This file was formerly known as: GEN_StdString.h.
- * @date April, 25, 2001
- */
-
#ifndef __STR_STRING_H__
#define __STR_STRING_H__
diff --git a/source/blender/blenfont/intern/blf_font.c
b/source/blender/blenfont/intern/blf_font.c
index d26c449dce2..9f81c41bd2d 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -79,7 +79,7 @@ static SpinLock ft_lib_mutex;
* Since most of the Text elems are not covered by other UI elements, we can
* group some strings together and render them in one drawcall. This behavior
* is on demand only, between BLF_batch_start() and BLF_batch_end().
- **/
+ */
static void blf_batch_draw_init(void)
{
GPUVertFormat format = {0};
diff --git a/source/blender/blenkernel/intern/appdir.c
b/source/blender/blenkernel/intern/appdir.c
index bc265b6c465..bb0b9a23431 100644
--- a/source/blender/blenkernel/intern/appdir.c
+++ b/source/blender/blenkernel/intern/appdir.c
@@ -276,7 +276,7 @@ static bool get_path_environment(
* \param targetpath: String to return path
* \param folder_name: default name of folder within user area
* \param subfolder_name: optional name of subfolder within folder
- * \param ver: Blender version, used to construct a subdirectory name
+ * \param ver: Blender version, used to construct a subdirectory name
* \return true if it was able to construct such a path.
*/
static bool get_path_user(
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c
b/source/blender/blenkernel/intern/cdderivedmesh.c
index 859c5534183..9634cbccd91 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -53,7 +53,7 @@ typedef struct {
DerivedMesh dm;
/* these point to data in the DerivedMesh custom data layers,
- * they are only here for efficiency and convenience **/
+ * they are only here for efficiency and convenience */
MVert *mvert;
MEdge *medge;
MFace *mface;
diff --git a/source/blender/blenkernel/intern/cloth.c
b/source/blender/blenkernel/intern/cloth.c
index 10f16fc6bcf..dddb34afd39 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -584,9 +584,8 @@ void cloth_free_modifier_extern(ClothModifierData *clmd )
******************************************************************************/
/**
- * cloth_to_object - copies the deformed vertices to the object.
- *
- **/
+ * Copies the deformed vertices to the object.
+ */
static void cloth_to_object (Object *ob, ClothModifierData *clmd, float
(*vertexCos)[3])
{
unsigned int i = 0;
@@ -614,12 +613,11 @@ int cloth_uses_vgroup(ClothModifierData *clmd)
}
/**
- * cloth_apply_vgroup - applies a vertex group as specified by type
- *
- **/
-/* can be optimized to do all groups in one loop */
+ * Applies a vertex group as specified by type.
+ */
static void cloth_apply_vgroup ( ClothModifierData *clmd, Mesh *mesh )
{
+ /* Can be optimized to do all groups in one loop. */
int i = 0;
int j = 0;
MDeformVert *dvert = NULL;
diff --git a/source/blender/blenkernel/intern/effect.c
b/source/blender/blenkernel/intern/effect.c
index d1ad7f10206..5628fce226c 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -618,7 +618,6 @@ int get_effector_data(EffectorCache *eff, EffectorData
*efd, EffectedPoint *poin
efd->size = 0.0f;
- /**/
ret = 1;
}
}
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c
b/source/blender/blenkernel/intern/gpencil_modifier.c
index 5af0bd99721..d09a914e23e 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -515,10 +515,10 @@ void BKE_gpencil_eval_geometry(Depsgraph *depsgraph,
* This would be better than inventing our own logic for this stuff...
*/
- /* TODO: Move the following code to "BKE_gpencil_eval_done()" (marked
as an exit node)
- * later when there's more happening here. For now, let's just keep
this
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
