archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: comment block tabs

Browse Source
This commit is contained in:
Campbell Barton
2018-11-14 12:53:15 +11:00
parent b97a2c3688
commit d7f55c4ff5
584 changed files with 2483 additions and 2489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/elbeem/extern/LBM_fluidsim.h vendored
View File

@@ -1,7 +1,4 @@
/*
* BKE_fluidsim.h
*
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
@@ -44,5 +41,3 @@ int performElbeemSimulation(char *cfgfilename);
#endif

4
source/blender/blenkernel/intern/boids.c
View File

@@ -1282,8 +1282,8 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa)
/* integrate new location & velocity */
/* by regarding the acceleration as a force at this stage we*/
/* can get better control although it's a bit unphysical */
/* by regarding the acceleration as a force at this stage we
* can get better control although it's a bit unphysical */
mul_v3_fl(acc, 1.0f/pa_mass);
copy_v3_v3(dvec, acc);

14
source/blender/blenkernel/intern/cloth.c
View File

@@ -1439,13 +1439,13 @@ static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm )
}
}
else {
/* bending springs for hair strands */
/* The current algorithm only goes through the edges in order of the mesh edges list */
/* and makes springs between the outer vert of edges sharing a vertice. This works just */
/* fine for hair, but not for user generated string meshes. This could/should be later */
/* extended to work with non-ordered edges so that it can be used for general "rope */
/* dynamics" without the need for the vertices or edges to be ordered through the length*/
/* of the strands. -jahka */
/* bending springs for hair strands
* The current algorithm only goes through the edges in order of the mesh edges list
* and makes springs between the outer vert of edges sharing a vertice. This works just
* fine for hair, but not for user generated string meshes. This could/should be later
* extended to work with non-ordered edges so that it can be used for general "rope
* dynamics" without the need for the vertices or edges to be ordered through the length
* of the strands. -jahka */
search = cloth->springs;
search2 = search->next;
while (search && search2) {

8
source/blender/blenkernel/intern/collision.c
View File

@@ -1062,9 +1062,11 @@ BLI_INLINE bool cloth_point_face_collision_params(const float p1[3], const float
*r_lambda = f * dot_v3v3(edge2, q);
/* don't care about 0..1 lambda range here */
/*if ((*r_lambda < 0.0f) || (*r_lambda > 1.0f))
* return 0;
*/
#if 0
if ((*r_lambda < 0.0f) || (*r_lambda > 1.0f)) {
return 0;
}
#endif
r_w[0] = 1.0f - u - v;
r_w[1] = u;

12
source/blender/blenkernel/intern/constraint.c
View File

@@ -2764,12 +2764,14 @@ static void stretchto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
normalize_v3_v3(zz, cob->matrix[2]);
/* XXX That makes the constraint buggy with asymmetrically scaled objects, see #29940. */
/* sub_v3_v3v3(vec, cob->matrix[3], ct->matrix[3]);*/
/* vec[0] /= size[0];*/
/* vec[1] /= size[1];*/
/* vec[2] /= size[2];*/
#if 0
sub_v3_v3v3(vec, cob->matrix[3], ct->matrix[3]);
vec[0] /= size[0];
vec[1] /= size[1];
vec[2] /= size[2];
/* dist = normalize_v3(vec);*/
dist = normalize_v3(vec);
#endif
dist = len_v3v3(cob->matrix[3], ct->matrix[3]);
/* Only Y constrained object axis scale should be used, to keep same length when scaling it. */

4
source/blender/blenkernel/intern/shrinkwrap.c
View File

@@ -187,8 +187,8 @@ static void shrinkwrap_calc_nearest_vertex(ShrinkwrapCalcData *calc)
* Returns true if "hit" was updated.
* Opts control whether an hit is valid or not
* Supported options are:
* MOD_SHRINKWRAP_CULL_TARGET_FRONTFACE (front faces hits are ignored)
* MOD_SHRINKWRAP_CULL_TARGET_BACKFACE (back faces hits are ignored)
* - MOD_SHRINKWRAP_CULL_TARGET_FRONTFACE (front faces hits are ignored)
* - MOD_SHRINKWRAP_CULL_TARGET_BACKFACE (back faces hits are ignored)
*/
bool BKE_shrinkwrap_project_normal(
char options, const float vert[3], const float dir[3],

1
source/blender/blenlib/BLI_math.h
View File

@@ -28,6 +28,7 @@
/** \file BLI_math.h
* \ingroup bli
*
* \section mathabbrev Abbreviations
*
* - ``fl`` = float

13
source/blender/blenlib/intern/math_matrix.c
View File

@@ -822,9 +822,8 @@ bool invert_m4(float m[4][4])
}
/*
* invertmat -
* computes the inverse of mat and puts it in inverse. Returns
* true on success (i.e. can always find a pivot) and false on failure.
* Computes the inverse of mat and puts it in inverse.
* Returns true on success (i.e. can always find a pivot) and false on failure.
* Uses Gaussian Elimination with partial (maximal column) pivoting.
*
* Mark Segal - 1992
@@ -2188,11 +2187,11 @@ void svd_m4(float U[4][4], float s[4], float V[4][4], float A_[4][4])
* negligible elements in the s and e arrays. On
* completion the variables kase and k are set as follows.
*
* kase = 1 if s(p) and e[k - 1] are negligible and k<p
* kase = 2 if s(k) is negligible and k<p
* kase = 3 if e[k - 1] is negligible, k<p, and
* kase = 1: if s(p) and e[k - 1] are negligible and k<p
* kase = 2: if s(k) is negligible and k<p
* kase = 3: if e[k - 1] is negligible, k<p, and
* s(k), ..., s(p) are not negligible (qr step).
* kase = 4 if e(p - 1) is negligible (convergence). */
* kase = 4: if e(p - 1) is negligible (convergence). */
for (k = p - 2; k >= -1; k--) {
if (k == -1) {

3
source/blender/collada/AnimationExporter.cpp
View File

@@ -79,7 +79,8 @@ bool AnimationExporter::is_flat_line(std::vector<float> &values, int channel_cou
* axis_name = "" (actually not used)
* is_rot = false (see xxx below)
*
* xxx: I tried to create a 3 axis rotation animation
* xxx:
* I tried to create a 3 axis rotation animation
* like for translation or scale. But i could not
* figure out how to setup the channel for this case.
* So for now rotations are exported as 3 separate 1-axis collada animations

2
source/blender/editors/animation/keyingsets.c
View File

@@ -520,7 +520,7 @@ void ANIM_OT_keying_set_active_set(wmOperatorType *ot)
/* keyingset to use (dynamic enum) */
prop = RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use");
RNA_def_enum_funcs(prop, ANIM_keying_sets_enum_itemf);
/* RNA_def_property_flag(prop, PROP_HIDDEN);*/
// RNA_def_property_flag(prop, PROP_HIDDEN);
}
/* ******************************************* */

2
source/blender/editors/armature/armature_relations.c
View File

@@ -252,7 +252,7 @@ int join_armature_exec(bContext *C, wmOperator *op)
float mat[4][4], oimat[4][4];
bool ok = false;
/* Ensure we're not in editmode and that the active object is an armature*/
/* Ensure we're not in editmode and that the active object is an armature. */
if (!ob || ob->type != OB_ARMATURE)
return OPERATOR_CANCELLED;
if (!arm || arm->edbo)

2
source/blender/editors/gpencil/editaction_gpencil.c
View File

@@ -486,7 +486,7 @@ bool ED_gpencil_anim_copybuf_paste(bAnimContext *ac, const short offset_mode)
* - We cannot just add a duplicate frame, as that would cause errors
* - For now, we don't check if the types will be compatible since we
* don't have enough info to do so. Instead, we simply just paste,
* af it works, it will show up.
* if it works, it will show up.
*/
for (gps = gpfs->strokes.first; gps; gps = gps->next) {
/* make a copy of stroke, then of its points array */

2
source/blender/editors/interface/interface_ops.c
View File

@@ -936,7 +936,7 @@ static int edittranslation_exec(bContext *C, wmOperator *op)
}
/* Try to find a valid po file for current language... */
edittranslation_find_po_file(root, uilng, popath, FILE_MAX);
/* printf("po path: %s\n", popath);*/
/* printf("po path: %s\n", popath); */
if (popath[0] == '\0') {
BKE_reportf(op->reports, RPT_ERROR, "No valid po found for language '%s' under %s", uilng, root);
return OPERATOR_CANCELLED;

7
source/blender/editors/space_nla/nla_ops.c
View File

@@ -340,10 +340,11 @@ void nla_keymap(wmKeyConfig *keyconf)
/* channels ---------------------------------------------------------- */
/* Channels are not directly handled by the NLA Editor module, but are inherited from the Animation module.
* Most of the relevant operations, keymaps, drawing, etc. can therefore all be found in that module instead, as there
* are many similarities with the other Animation Editors.
* Most of the relevant operations, keymaps, drawing, etc. can therefore all
* be found in that module instead, as there are many similarities with the other Animation Editors.
*
* However, those operations which involve clicking on channels and/or the placement of them in the view are implemented here instead
* However, those operations which involve clicking on channels and/or
* the placement of them in the view are implemented here instead
*/
keymap = WM_keymap_ensure(keyconf, "NLA Channels", SPACE_NLA, 0);
nla_keymap_channels(keymap);

4
source/blender/imbuf/intern/filter.c
View File

@@ -42,10 +42,6 @@
#include "imbuf.h"
/************************************************************************/
/* FILTERS */
/************************************************************************/
static void filtrow(unsigned char *point, int x)
{
unsigned int c1, c2, c3, error;

5
source/blender/imbuf/intern/scaling.c
View File

@@ -45,11 +45,6 @@
#include "BLI_sys_types.h" // for intptr_t support
/************************************************************************/
/* SCALING */
/************************************************************************/
static void imb_half_x_no_alloc(struct ImBuf *ibuf2, struct ImBuf *ibuf1)
{
uchar *p1, *_p1, *dest;

2
source/blender/makesdna/DNA_anim_types.h
View File

@@ -353,7 +353,7 @@ typedef enum eDriverVar_Types {
/* maximum number of variable types
* NOTE: this must always be th last item in this list,
* so add new types above this line
* so add new types above this line.
*/
MAX_DVAR_TYPES
} eDriverVar_Types;

8
source/blender/makesrna/intern/rna_fcurve.c
View File

@@ -111,8 +111,10 @@ static StructRNA *rna_FModifierType_refine(struct PointerRNA *ptr)
return &RNA_FModifierCycles;
case FMODIFIER_TYPE_NOISE:
return &RNA_FModifierNoise;
/*case FMODIFIER_TYPE_FILTER: */
/* return &RNA_FModifierFilter; */
#if 0
case FMODIFIER_TYPE_FILTER:
return &RNA_FModifierFilter;
#endif
case FMODIFIER_TYPE_PYTHON:
return &RNA_FModifierPython;
case FMODIFIER_TYPE_LIMITS:
@@ -1569,7 +1571,7 @@ static void rna_def_drivervar(BlenderRNA *brna)
static void rna_def_channeldriver_variables(BlenderRNA *brna, PropertyRNA *cprop)
{
StructRNA *srna;
/* PropertyRNA *prop; */
/* PropertyRNA *prop; */
FunctionRNA *func;
PropertyRNA *parm;

2
source/blender/makesrna/intern/rna_scene.c
View File

@@ -2894,7 +2894,7 @@ static void rna_def_tool_settings(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_bone_sketching", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "bone_sketching", BONE_SKETCHING);
RNA_def_property_ui_text(prop, "Use Bone Sketching", "Use sketching to create and edit bones");
/* RNA_def_property_ui_icon(prop, ICON_EDIT, 0); */
// RNA_def_property_ui_icon(prop, ICON_EDIT, 0);
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "use_etch_quick", PROP_BOOLEAN, PROP_NONE);

2
source/blender/render/intern/raytrace/rayobject_rtbuild.h
View File

@@ -40,7 +40,7 @@ extern "C" {
/*
* Ray Tree Builder
* Ray Tree Builder:
* this structs helps building any type of tree
* it contains several methods to organize/split nodes
* allowing to create a given tree on the fly.

2
source/gameengine/Ketsji/KX_Dome.cpp
View File

@@ -535,7 +535,7 @@ bool KX_Dome::ParseWarpMesh(STR_String text)
void KX_Dome::CreateMeshDome180(void)
{
/*
* 1)- Define the faces of half of a cube
* 1) Define the faces of half of a cube
* - each face is made out of 2 triangles
* 2) Subdivide the faces
* - more resolution == more curved lines

2
source/gameengine/SceneGraph/SG_Spatial.h
View File

@@ -60,7 +60,7 @@ protected:
MT_Matrix3x3 m_worldRotation;
MT_Vector3 m_worldScaling;
SG_ParentRelation * m_parent_relation;
SG_ParentRelation *m_parent_relation;
SG_BBox m_bbox;
MT_Scalar m_radius;