Commit: 83435182720fa815194f7aed90cdf4ad81f50a81
Author: Campbell Barton
Date: Fri Jul 15 02:36:21 2016 +1000
Branches: master
https://developer.blender.org/rB83435182720fa815194f7aed90cdf4ad81f50a81
Cleanup: comment blocks
===================================================================
M intern/cycles/render/object.cpp
M intern/ghost/intern/GHOST_SystemX11.cpp
M intern/guardedalloc/test/simpletest/memtest.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/bmesh/operators/bmo_connect_pair.c
M source/blender/collada/collada_utils.cpp
M source/blender/compositor/operations/COM_MaskOperation.cpp
M source/blender/editors/interface/interface.c
M source/blender/editors/object/object_vgroup.c
M source/blender/editors/space_view3d/view3d_project.c
M source/blender/editors/transform/transform_snap_object.c
M source/blender/gpu/intern/gpu_buffers.c
M source/blender/gpu/intern/gpu_draw.c
M source/blender/gpu/intern/gpu_extensions.c
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/quicktime/apple/qtkit_import.m
M source/blender/render/intern/source/pipeline.c
M source/blender/render/intern/source/sss.c
===================================================================
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index ff1f678..662d87e 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -184,7 +184,7 @@ void Object::apply_transform(bool apply_to_motion)
}
/* tfm is not reset to identity, all code that uses it needs to check
the
- transform_applied boolean */
+ * transform_applied boolean */
}
void Object::tag_update(Scene *scene)
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp
b/intern/ghost/intern/GHOST_SystemX11.cpp
index 55d013f..6f34954 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -1985,9 +1985,8 @@ GHOST_TSuccess
GHOST_SystemX11::pushDragDropEvent(GHOST_TEventType eventType,
);
}
#endif
-/*
+/**
* These callbacks can be used for debugging, so we can breakpoint on an X11
error.
-
*
* Dummy function to get around IO Handler exiting if device invalid
* Basically it will not crash blender now if you have a X device that
diff --git a/intern/guardedalloc/test/simpletest/memtest.c
b/intern/guardedalloc/test/simpletest/memtest.c
index 841b47b..79d55dd 100644
--- a/intern/guardedalloc/test/simpletest/memtest.c
+++ b/intern/guardedalloc/test/simpletest/memtest.c
@@ -26,7 +26,6 @@
*/
/**
-
* Copyright (C) 2001 NaN Technologies B.V.
* Simple test of memory.
*/
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c
b/source/blender/blenkernel/intern/subsurf_ccg.c
index b0d1932..f73dbd8 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -3472,7 +3472,7 @@ static void ccgDM_drawFacesTex_common(DerivedMesh *dm,
if (!flush && compareDrawOptions) {
/* also compare draw options and flush buffer
if they're different
- * need for face selection highlight in
edit mode */
+ * need for face selection highlight in edit
mode */
flush |= compareDrawOptions(userData,
actualFace, next_actualFace) == 0;
}
diff --git a/source/blender/bmesh/operators/bmo_connect_pair.c
b/source/blender/bmesh/operators/bmo_connect_pair.c
index 3eb6fe0..241086f 100644
--- a/source/blender/bmesh/operators/bmo_connect_pair.c
+++ b/source/blender/bmesh/operators/bmo_connect_pair.c
@@ -125,7 +125,7 @@ typedef struct PathLinkState {
/**
\name Min Dist Dir Util
-
+ *
* Simply getting the closest intersecting vert/edge is _not_ good enough. see
T43792
* we need to get the closest in both directions since the absolute closest
may be a dead-end.
*
diff --git a/source/blender/collada/collada_utils.cpp
b/source/blender/collada/collada_utils.cpp
index 649c86e..abe5130 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -539,8 +539,8 @@ void BoneExtended::set_bone_layers(std::string layerString,
std::vector<std::str
}
/* If numeric layers and labeled layers are used in parallel
(unlikely),
- we get a potential mixup. Just leave as is for now.
- */
+ * we get a potential mixup. Just leave as is for now.
+ */
this->bone_layers = bc_set_layer(this->bone_layers, pos);
}
diff --git a/source/blender/compositor/operations/COM_MaskOperation.cpp
b/source/blender/compositor/operations/COM_MaskOperation.cpp
index d6e5fdf..caafdfe 100644
--- a/source/blender/compositor/operations/COM_MaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_MaskOperation.cpp
@@ -1,5 +1,4 @@
/*
-
* Copyright 2012, Blender Foundation.
*
* This program is free software; you can redistribute it and/or
diff --git a/source/blender/editors/interface/interface.c
b/source/blender/editors/interface/interface.c
index ba7240b..cbe8654 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -1138,7 +1138,7 @@ static bool ui_but_event_property_operator_string(const
bContext *C, uiBut *but,
* as new items are added to the menu later on. It also optimises efficiency -
* a radial menu is best kept symmetrical, with as large an angle between
* items as possible, so that the gestural mouse movements can be fast and
inexact.
-
+ *
* It starts off with two opposite sides for the first two items
* then joined by the one below for the third (this way, even with three items,
* the menu seems to still be 'in order' reading left to right). Then the
fourth is
diff --git a/source/blender/editors/object/object_vgroup.c
b/source/blender/editors/object/object_vgroup.c
index 6e8aaeb..ad41fb2 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -3538,8 +3538,10 @@ static int vgroup_sort_name(const void *def_a_ptr, const
void *def_b_ptr)
return BLI_natstrcmp(def_a->name, def_b->name);
}
-/* Sorts the weight groups according to the bone hierarchy of the
- associated armature (similar to how bones are ordered in the Outliner) */
+/**
+ * Sorts the weight groups according to the bone hierarchy of the
+ * associated armature (similar to how bones are ordered in the Outliner)
+ */
static void vgroup_sort_bone_hierarchy(Object *ob, ListBase *bonebase)
{
if (bonebase == NULL) {
diff --git a/source/blender/editors/space_view3d/view3d_project.c
b/source/blender/editors/space_view3d/view3d_project.c
index e6d8bdc..7448d4c 100644
--- a/source/blender/editors/space_view3d/view3d_project.c
+++ b/source/blender/editors/space_view3d/view3d_project.c
@@ -537,7 +537,7 @@ void ED_view3d_win_to_delta(const ARegion *ar, const float
mval[2], float out[3]
* \note Orthographic views have a less obvious origin,
* Since far clip can be a very large value resulting in numeric precision
issues,
* the origin in this case is close to zero coordinate.
-
+ *
* \param ar The region (used for the window width and height).
* \param mval The area relative 2d location (such as event->mval converted to
floats).
* \param out The resulting normalized world-space direction vector.
diff --git a/source/blender/editors/transform/transform_snap_object.c
b/source/blender/editors/transform/transform_snap_object.c
index 29ac8f8..6e412f5 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -219,12 +219,12 @@ static void raycast_all_cb(void *userdata, int index,
const BVHTreeRay *ray, BVH
/* -------------------------------------------------------------------- */
/** \Common utilities
-* \{ */
+ * \{ */
/**
-* struct that kepts basic information about a BVHTree build from a editmesh
-*/
+ * Struct that kepts basic information about a BVHTree build from a editmesh.
+ */
typedef struct BVHTreeFromMeshType {
void *userdata;
char type;
@@ -253,11 +253,11 @@ static void precalc_project(
}
/**
-* From a threshold (maximum distance to snap in pixels) returns:
-*
-* - The *real* distance (3D) if you are in orthographic-view.
-* - The *tangent* (view cone radius at distance 1.0) if you are in
perspective-view.
-*/
+ * From a threshold (maximum distance to snap in pixels) returns:
+ *
+ * - The *real* distance (3D) if you are in orthographic-view.
+ * - The *tangent* (view cone radius at distance 1.0) if you are in
perspective-view.
+ */
static float dist_px_to_dist3d_or_tangent(const ARegion *ar, const float
dist_px)
{
const RegionView3D *rv3d = ar->regiondata;
@@ -470,7 +470,7 @@ static bool test_projected_edge_dist(
/* -------------------------------------------------------------------- */
/** \Walk DFS
-* \{ */
+ * \{ */
typedef struct Object_Nearest2dPrecalc {
float ray_origin_local[3];
float ray_direction_local[3];
@@ -1562,9 +1562,9 @@ static bool snapEditMesh(
mul_m4_v3(imat, ray_org_local);
/* We pass a temp ray_start, set from
object's boundbox,
- * to avoid precision issues with very
far away ray_start values
- * (as returned in case of ortho
view3d), see T38358.
- */
+ * to avoid precision issues with very
far away ray_start values
+ * (as returned in case of ortho
view3d), see T38358.
+ */
len_diff -= local_scale; /* make temp
start point a bit away from bbox hit point. */
madd_v3_v3v3fl(ray_start_local,
ray_org_local, ray_normal_local, len_diff + depth_range[0]);
local_depth -= len_diff;
diff --git a/source/blender/gpu/intern/gpu_buffers.c
b/source/blender/gpu/intern/gpu_buffers.c
index c663af0..3708413 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -916,7 +916,7 @@ void GPU_buffer_unlock(GPUBuffer *UNUSED(buffer),
GPUBindingType binding)
{
int bindtypegl = gpu_binding_type_gl[binding];
/* note: this operation can fail, could return
- * an error code from this function? */
+ * an error code from this function? */
glUnmapBuffer(bindtypegl);
glBindBuffer(bindtypegl, 0);
}
diff --git a/source/blender/gpu/intern/gpu_draw.c
b/source/blender/gpu/intern/gpu_draw.c
index 064e917..7936811 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -803,7 +803,7 @@ static void **gpu_gen_cube_map(unsigned int *rect, float
*frect, int rectw, int
* | | | |
* | NegZ | PosZ | PosY |
* |______|______|______|
- */
+ */
if (use_high_bit_depth) {
float (*frectb)[4] = (float(*)[4])frect;
float (**fsides)[4] = (float(**)[4])sides;
diff --git a/source/blender/gpu/intern/gpu_extensions.c
b/source/blender/gpu/intern/gpu_extensions.c
index b8a39c8..d41573b 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -77,9 +77,10 @@ static struct GPUGlobal {
GPUDeviceType device;
GPUOSType os;
GPUDriverType driver;
- float dfdyfactors[2]; /* workaround for different calculation of dfdy
factors on GPUs. Some GPUs/drivers
- calculate dfdy in shader differently when
drawing to an offscreen buffer. First
- number is factor on screen and second is
off-screen */
+ /* workaround for different calculation of dfdy factors on GPUs. Some
GPUs/drivers
+ * calculate dfdy in shader differently when drawing to an offscreen
buffer. First
+ * number is factor on screen an
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
