[Bf-blender-cvs] [9f5621b] master: Cleanup: comment blocks
Campbell Barton
noreply at git.blender.org
Sat Jul 2 10:17:52 CEST 2016
Commit: 9f5621bb4ae9f2cd431f80d2ede732639d7dbe37
Author: Campbell Barton
Date: Sat Jul 2 10:02:04 2016 +1000
Branches: master
https://developer.blender.org/rB9f5621bb4ae9f2cd431f80d2ede732639d7dbe37
Cleanup: comment blocks
===================================================================
M intern/cycles/kernel/geom/geom_curve.h
M intern/cycles/kernel/kernel_light.h
M intern/cycles/kernel/kernel_types.h
M intern/cycles/render/nodes.cpp
M intern/decklink/DeckLinkAPI.cpp
M intern/decklink/DeckLinkAPI.h
M intern/gpudirect/dvpapi.cpp
M intern/gpudirect/dvpapi.h
M source/blender/blenkernel/BKE_bvhutils.h
M source/blender/blenkernel/intern/mball_tessellate.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenlib/intern/BLI_kdopbvh.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/collada/collada_utils.cpp
M source/blender/compositor/intern/COM_OpenCLDevice.h
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/editors/gpencil/gpencil_utils.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/transform/transform_snap_object.c
M source/blender/freestyle/intern/geometry/normal_cycle.h
M source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
M source/blender/freestyle/intern/scene_graph/FrsMaterial.h
M source/blender/freestyle/intern/stroke/AdvancedPredicates1D.h
M source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
M source/blender/freestyle/intern/stroke/Stroke.h
M source/blender/freestyle/intern/view_map/Functions0D.h
M source/blender/freestyle/intern/view_map/Silhouette.h
M source/blender/freestyle/intern/winged_edge/Curvature.cpp
M source/blender/modifiers/intern/MOD_correctivesmooth.c
M source/blender/modifiers/intern/MOD_wireframe.c
M source/blender/nodes/shader/nodes/node_shader_brightness.c
M source/blender/nodes/shader/nodes/node_shader_gamma.c
M source/blender/python/intern/bpy_interface.c
M source/blender/render/intern/source/pipeline.c
M source/gameengine/Expressions/intern/IntValue.cpp
M source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
M source/gameengine/Physics/Bullet/CcdPhysicsController.h
M source/gameengine/Rasterizer/RAS_IOffScreen.h
M source/gameengine/Rasterizer/RAS_ISync.h
M source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLOffScreen.cpp
M source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLOffScreen.h
M source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLSync.cpp
M source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLSync.h
M source/gameengine/VideoTexture/DeckLink.cpp
M source/gameengine/VideoTexture/DeckLink.h
M source/gameengine/VideoTexture/VideoDeckLink.cpp
M source/gameengine/VideoTexture/VideoDeckLink.h
===================================================================
diff --git a/intern/cycles/kernel/geom/geom_curve.h b/intern/cycles/kernel/geom/geom_curve.h
index 8894843..292e1bf 100644
--- a/intern/cycles/kernel/geom/geom_curve.h
+++ b/intern/cycles/kernel/geom/geom_curve.h
@@ -450,8 +450,8 @@ ccl_device_inline bool bvh_cardinal_curve_intersect(KernelGlobals *kg, Intersect
else if(level == 1) {
/* the maximum recursion depth is reached.
- * check if dP0.(Q-P0)>=0 and dPn.(Pn-Q)>=0.
- * dP* is reversed if necessary.*/
+ * check if dP0.(Q-P0)>=0 and dPn.(Pn-Q)>=0.
+ * dP* is reversed if necessary.*/
float t = isect->t;
float u = 0.0f;
float gd = 0.0f;
diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h
index 736a884..93c4bd3 100644
--- a/intern/cycles/kernel/kernel_light.h
+++ b/intern/cycles/kernel/kernel_light.h
@@ -51,8 +51,8 @@ ccl_device float area_light_sample(float3 P,
bool sample_coord)
{
/* In our name system we're using P for the center,
- * which is o in the paper.
- */
+ * which is o in the paper.
+ */
float3 corner = *light_p - axisu * 0.5f - axisv * 0.5f;
float axisu_len, axisv_len;
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 76d2a6b..2187e3c 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -769,7 +769,7 @@ typedef ccl_addr_space struct ShaderData {
int type;
/* parametric coordinates
- * - barycentric weights for triangles */
+ * - barycentric weights for triangles */
float u;
float v;
/* object id if there is one, ~0 otherwise */
@@ -792,14 +792,14 @@ typedef ccl_addr_space struct ShaderData {
#endif
#ifdef __DPDU__
/* differential of P w.r.t. parametric coordinates. note that dPdu is
- * not readily suitable as a tangent for shading on triangles. */
+ * not readily suitable as a tangent for shading on triangles. */
float3 dPdu;
float3 dPdv;
#endif
#ifdef __OBJECT_MOTION__
/* object <-> world space transformations, cached to avoid
- * re-interpolating them constantly for shading */
+ * re-interpolating them constantly for shading */
Transform ob_tfm;
Transform ob_itfm;
#endif
@@ -1171,11 +1171,11 @@ typedef ccl_addr_space struct DebugData {
#define QUEUE_EMPTY_SLOT -1
/*
-* Queue 1 - Active rays
-* Queue 2 - Background queue
-* Queue 3 - Shadow ray cast kernel - AO
-* Queeu 4 - Shadow ray cast kernel - direct lighting
-*/
+ * Queue 1 - Active rays
+ * Queue 2 - Background queue
+ * Queue 3 - Shadow ray cast kernel - AO
+ * Queeu 4 - Shadow ray cast kernel - direct lighting
+ */
#define NUM_QUEUES 4
/* Queue names */
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 8702082..b38135f 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -611,10 +611,10 @@ static float sky_perez_function(float lam[6], float theta, float gamma)
static void sky_texture_precompute_old(SunSky *sunsky, float3 dir, float turbidity)
{
/*
- * We re-use the SunSky struct of the new model, to avoid extra variables
- * zenith_Y/x/y is now radiance_x/y/z
- * perez_Y/x/y is now config_x/y/z
- */
+ * We re-use the SunSky struct of the new model, to avoid extra variables
+ * zenith_Y/x/y is now radiance_x/y/z
+ * perez_Y/x/y is now config_x/y/z
+ */
float2 spherical = sky_spherical_coordinates(dir);
float theta = spherical.x;
diff --git a/intern/decklink/DeckLinkAPI.cpp b/intern/decklink/DeckLinkAPI.cpp
index 73a1264..aff25af 100644
--- a/intern/decklink/DeckLinkAPI.cpp
+++ b/intern/decklink/DeckLinkAPI.cpp
@@ -15,19 +15,19 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
-* The Original Code is Copyright (C) 2015, Blender Foundation
-* All rights reserved.
-*
-* The Original Code is: all of this file.
-*
-* Contributor(s): Blender Foundation.
+ * The Original Code is Copyright (C) 2015, Blender Foundation
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Blender Foundation.
*
* ***** END GPL LICENSE BLOCK *****
*/
/** \file decklink/DeckLinkAPI.cpp
-* \ingroup decklink
-*/
+ * \ingroup decklink
+ */
#include "DeckLinkAPI.h"
diff --git a/intern/decklink/DeckLinkAPI.h b/intern/decklink/DeckLinkAPI.h
index f6d2b79..2a429c1 100644
--- a/intern/decklink/DeckLinkAPI.h
+++ b/intern/decklink/DeckLinkAPI.h
@@ -15,19 +15,19 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
-* The Original Code is Copyright (C) 2015, Blender Foundation
-* All rights reserved.
-*
-* The Original Code is: all of this file.
-*
-* Contributor(s): Blender Foundation.
+ * The Original Code is Copyright (C) 2015, Blender Foundation
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Blender Foundation.
*
* ***** END GPL LICENSE BLOCK *****
*/
/** \file decklink/DeckLinkAPI.h
-* \ingroup decklink
-*/
+ * \ingroup decklink
+ */
#ifndef __DECKLINKAPI_H__
#define __DECKLINKAPI_H__
diff --git a/intern/gpudirect/dvpapi.cpp b/intern/gpudirect/dvpapi.cpp
index 8ae5cdb..56b58e0 100644
--- a/intern/gpudirect/dvpapi.cpp
+++ b/intern/gpudirect/dvpapi.cpp
@@ -1,33 +1,33 @@
/*
-* ***** BEGIN GPL LICENSE BLOCK *****
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software Foundation,
-* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-* The Original Code is Copyright (C) 2015, Blender Foundation
-* All rights reserved.
-*
-* The Original Code is: all of this file.
-*
-* Contributor(s): Blender Foundation.
-*
-* ***** END GPL LICENSE BLOCK *****
-*/
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2015, Blender Foundation
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Blender Foundation.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
/** \file gpudirect/dvpapi.c
-* \ingroup gpudirect
-*/
+ * \ingroup gpudirect
+ */
#ifdef WIN32
diff --git a/intern/gpudirect/dvpapi.h b/intern/gpudirect/dvpapi.h
index 4cc259f..cafc4e8 100644
--- a/intern/gpudirect/dvpapi.h
+++ b/intern/gpudirect/dvpapi.h
@@ -1,33 +1,33 @@
/*
-* ***** BEGIN GPL LICENSE BLOCK *****
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software Foundation,
-* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-* The Original Code is Copyright (C) 2015, Blender Foundation
-* All rights reserved.
-*
-* The Original Code is: all of this file.
-*
-* Contributor(s): Blender Foundation.
-*
-* ***** END GPL LICENSE BLOCK *****
-*/
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2015, Blender Foundation
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Blender Foundation.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
/** \file gpudirect/dvpapi.h
-* \ingroup gpudirect
-*/
+ * \ingroup gpudirect
+ */
#ifndef __DVPAPI_H__
#define __DVPAPI_H__
diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h
index 80b248a..07db221 100644
--- a/source/blender/blenkernel/BKE_bvhutils.h
+++ b/source/blender/blenkernel/BKE_bvhutils.h
@@ -46,8 +46,8 @@ struct MFace;
typedef struct LinkNode BVHCache;
/**
-* struct that kepts basic information about a BVHTree build from a editmesh
-*/
+ * struct that kepts basic information about a BVHTree build from
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list