[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51040] trunk/blender: style cleanup: comment blocks
Campbell Barton
ideasman42 at gmail.com
Thu Oct 4 15:26:16 CEST 2012
Revision: 51040
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51040
Author: campbellbarton
Date: 2012-10-04 13:26:15 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
style cleanup: comment blocks
Modified Paths:
--------------
trunk/blender/doc/manpage/blender.1
trunk/blender/source/blender/blenkernel/intern/colortools.c
trunk/blender/source/blender/blenkernel/intern/ipo.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/collada/DocumentImporter.cpp
trunk/blender/source/blender/collada/DocumentImporter.h
trunk/blender/source/blender/collada/GeometryExporter.cpp
trunk/blender/source/blender/compositor/operations/COM_TrackPositionOperation.h
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/imbuf/intern/indexer.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/nodes/composite/node_composite_tree.c
trunk/blender/source/blender/render/intern/source/occlusion.c
Modified: trunk/blender/doc/manpage/blender.1
===================================================================
(Binary files differ)
Modified: trunk/blender/source/blender/blenkernel/intern/colortools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/colortools.c 2012-10-04 11:39:30 UTC (rev 51039)
+++ trunk/blender/source/blender/blenkernel/intern/colortools.c 2012-10-04 13:26:15 UTC (rev 51040)
@@ -1289,9 +1289,9 @@
void BKE_color_managed_view_settings_init(ColorManagedViewSettings *settings)
{
/* OCIO_TODO: use default view transform here when OCIO is completely integrated
- * and proper versioning stuff is added.
- * for now use NONE to be compatible with all current files
- */
+ * and proper versioning stuff is added.
+ * for now use NONE to be compatible with all current files
+ */
BLI_strncpy(settings->view_transform, "Default", sizeof(settings->view_transform));
settings->gamma = 1.0f;
Modified: trunk/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ipo.c 2012-10-04 11:39:30 UTC (rev 51039)
+++ trunk/blender/source/blender/blenkernel/intern/ipo.c 2012-10-04 13:26:15 UTC (rev 51040)
@@ -1757,13 +1757,13 @@
{
/* If we have any empty action actuators, assume they were
- converted IPO Actuators using the object IPO */
+ * converted IPO Actuators using the object IPO */
bActuator *act;
bActionActuator *aa;
for (act = ob->actuators.first; act; act = act->next) {
/* Any actuators set to ACT_IPO at this point are actually Action Actuators that
- need this converted IPO to finish converting the actuator. */
+ * need this converted IPO to finish converting the actuator. */
if (act->type == ACT_IPO) {
aa = (bActionActuator *)act->data;
aa->act = ob->adt->action;
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2012-10-04 11:39:30 UTC (rev 51039)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2012-10-04 13:26:15 UTC (rev 51040)
@@ -2261,7 +2261,7 @@
Curve *cu = ob->data;
/* Use the object bounding box so that modifier output
- gets taken into account */
+ * gets taken into account */
if (ob->bb)
bb = *(ob->bb);
else {
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-10-04 11:39:30 UTC (rev 51039)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-10-04 13:26:15 UTC (rev 51040)
@@ -609,9 +609,9 @@
/* The end of the table should match 1.0 carefully. In order to avoid
* rounding errors, we just set this explicitly. The last segment may
- * have a different length than the other segments, but our
- * interpolation is insensitive to that
- */
+ * have a different length than the other segments, but our
+ * interpolation is insensitive to that
+ */
color_domain_table[RE_GAMMA_TABLE_SIZE] = 1.0;
gamma_range_table[RE_GAMMA_TABLE_SIZE] = 1.0;
inv_gamma_range_table[RE_GAMMA_TABLE_SIZE] = 1.0;
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-10-04 11:39:30 UTC (rev 51039)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-10-04 13:26:15 UTC (rev 51040)
@@ -3959,10 +3959,10 @@
sound = sound_new_file(bmain, seq_load->path); /* handles relative paths */
if (sound == NULL || sound->playback_handle == NULL) {
- /*
+#if 0
if (op)
BKE_report(op->reports, RPT_ERROR, "Unsupported audio format");
- */
+#endif
return NULL;
}
@@ -3971,10 +3971,10 @@
if (info.specs.channels == AUD_CHANNELS_INVALID) {
sound_delete(bmain, sound);
- /*
+#if 0
if (op)
BKE_report(op->reports, RPT_ERROR, "Unsupported audio format");
- */
+#endif
return NULL;
}
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-10-04 11:39:30 UTC (rev 51039)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-10-04 13:26:15 UTC (rev 51040)
@@ -206,7 +206,7 @@
* - join all Mains
* - link all LibBlocks and indirect pointers to libblocks
* - initialize FileGlobal and copy pointers to Global
-*/
+ */
/* also occurs in library.c */
/* GS reads the memory pointed at in a specific ordering. There are,
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2012-10-04 11:39:30 UTC (rev 51039)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2012-10-04 13:26:15 UTC (rev 51040)
@@ -30,48 +30,48 @@
/*
-FILEFORMAT: IFF-style structure (but not IFF compatible!)
+ * FILEFORMAT: IFF-style structure (but not IFF compatible!)
+ *
+ * start file:
+ * BLENDER_V100 12 bytes (versie 1.00)
+ * V = big endian, v = little endian
+ * _ = 4 byte pointer, - = 8 byte pointer
+ *
+ * datablocks: also see struct BHead
+ * <bh.code> 4 chars
+ * <bh.len> int, len data after BHead
+ * <bh.old> void, old pointer
+ * <bh.SDNAnr> int
+ * <bh.nr> int, in case of array: amount of structs
+ * data
+ * ...
+ * ...
+ *
+ * Almost all data in Blender are structures. Each struct saved
+ * gets a BHead header. With BHead the struct can be linked again
+ * and compared with StructDNA .
+ *
+ * WRITE
+ *
+ * Preferred writing order: (not really a must, but why would you do it random?)
+ * Any case: direct data is ALWAYS after the lib block
+ *
+ * (Local file data)
+ * - for each LibBlock
+ * - write LibBlock
+ * - write associated direct data
+ * (External file data)
+ * - per library
+ * - write library block
+ * - per LibBlock
+ * - write the ID of LibBlock
+ * - write TEST (128x128, blend file preview, optional)
+ * - write FileGlobal (some global vars)
+ * - write SDNA
+ * - write USER if filename is ~/X.XX/config/startup.blend
+ */
-start file:
- BLENDER_V100 12 bytes (versie 1.00)
- V = big endian, v = little endian
- _ = 4 byte pointer, - = 8 byte pointer
-datablocks: also see struct BHead
- <bh.code> 4 chars
- <bh.len> int, len data after BHead
- <bh.old> void, old pointer
- <bh.SDNAnr> int
- <bh.nr> int, in case of array: amount of structs
- data
- ...
- ...
-
-Almost all data in Blender are structures. Each struct saved
-gets a BHead header. With BHead the struct can be linked again
-and compared with StructDNA .
-
-WRITE
-
-Preferred writing order: (not really a must, but why would you do it random?)
-Any case: direct data is ALWAYS after the lib block
-
-(Local file data)
-- for each LibBlock
- - write LibBlock
- - write associated direct data
-(External file data)
-- per library
- - write library block
- - per LibBlock
- - write the ID of LibBlock
-- write TEST (128x128, blend file preview, optional)
-- write FileGlobal (some global vars)
-- write SDNA
-- write USER if filename is ~/X.XX/config/startup.blend
-*/
-
-
#include <math.h>
#include <fcntl.h>
#include <stdio.h>
Modified: trunk/blender/source/blender/collada/DocumentImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentImporter.cpp 2012-10-04 11:39:30 UTC (rev 51039)
+++ trunk/blender/source/blender/collada/DocumentImporter.cpp 2012-10-04 13:26:15 UTC (rev 51040)
@@ -88,8 +88,8 @@
/*
- COLLADA Importer limitations:
- - no multiple scene import, all objects are added to active scene
+ * COLLADA Importer limitations:
+ * - no multiple scene import, all objects are added to active scene
*/
// #define COLLADA_DEBUG
@@ -878,7 +878,7 @@
}
break;
/* XXX correct way to do following four is probably to get also render
- size and determine proper settings from that somehow */
+ * size and determine proper settings from that somehow */
case COLLADAFW::Camera::ASPECTRATIO_AND_X:
case COLLADAFW::Camera::SINGLE_X:
case COLLADAFW::Camera::X_AND_Y:
Modified: trunk/blender/source/blender/collada/DocumentImporter.h
===================================================================
--- trunk/blender/source/blender/collada/DocumentImporter.h 2012-10-04 11:39:30 UTC (rev 51039)
+++ trunk/blender/source/blender/collada/DocumentImporter.h 2012-10-04 13:26:15 UTC (rev 51040)
@@ -78,8 +78,9 @@
void write_profile_COMMON(COLLADAFW::EffectCommon*, Material*);
void translate_anim_recursive(COLLADAFW::Node*, COLLADAFW::Node*, Object*);
- /** This method will be called if an error in the loading process occurred and the loader cannot
- continue to load. The writer should undo all operations that have been performed.
+ /**
+ * This method will be called if an error in the loading process occurred and the loader cannot
+ * continue to load. The writer should undo all operations that have been performed.
\param errorMessage A message containing informations about the error that occurred.
*/
void cancel(const COLLADAFW::String& errorMessage);
Modified: trunk/blender/source/blender/collada/GeometryExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/GeometryExporter.cpp 2012-10-04 11:39:30 UTC (rev 51039)
+++ trunk/blender/source/blender/collada/GeometryExporter.cpp 2012-10-04 13:26:15 UTC (rev 51040)
@@ -358,8 +358,8 @@
param.push_back("X");
param.push_back("Y");
param.push_back("Z");
- /*main function, it creates <source id = "">, <float_array id = ""
- count = ""> */
+ /* main function, it creates <source id = "">, <float_array id = ""
+ * count = ""> */
source.prepareToAppendValues();
//appends data to <float_array>
int i = 0;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list