[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52316] trunk/blender: style cleanup: comments & spelling
Campbell Barton
ideasman42 at gmail.com
Sun Nov 18 02:22:37 CET 2012
Revision: 52316
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52316
Author: campbellbarton
Date: 2012-11-18 01:22:31 +0000 (Sun, 18 Nov 2012)
Log Message:
-----------
style cleanup: comments & spelling
Modified Paths:
--------------
trunk/blender/release/scripts/modules/addon_utils.py
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
trunk/blender/source/blender/blenlib/intern/math_rotation.c
trunk/blender/source/blender/blenlib/intern/scanfill.c
trunk/blender/source/blender/bmesh/intern/bmesh_iterators.h
trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
trunk/blender/source/blender/collada/DocumentImporter.cpp
trunk/blender/source/blender/collada/DocumentImporter.h
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/imbuf/intern/cineon/dpxlib.c
trunk/blender/source/blender/imbuf/intern/dds/BlockDXT.h
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
trunk/blender/source/blender/python/generic/bpy_internal_import.c
trunk/blender/source/blender/windowmanager/intern/wm_draw.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blender/windowmanager/intern/wm_playanim.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
trunk/blender/source/blender/windowmanager/wm_event_types.h
trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
trunk/blender/source/gameengine/SceneGraph/SG_IObject.h
Modified: trunk/blender/release/scripts/modules/addon_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/addon_utils.py 2012-11-18 01:20:02 UTC (rev 52315)
+++ trunk/blender/release/scripts/modules/addon_utils.py 2012-11-18 01:22:31 UTC (rev 52316)
@@ -232,7 +232,6 @@
import os
import sys
- import imp
def handle_error():
import traceback
@@ -246,6 +245,7 @@
mtime_orig = getattr(mod, "__time__", 0)
mtime_new = os.path.getmtime(mod.__file__)
if mtime_orig != mtime_new:
+ import imp
print("module changed on disk:", mod.__file__, "reloading...")
try:
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2012-11-18 01:20:02 UTC (rev 52315)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2012-11-18 01:22:31 UTC (rev 52316)
@@ -2568,10 +2568,12 @@
sbFreeSimulation(pid->calldata);
else if (pid->type == PTCACHE_TYPE_PARTICLES)
psys_reset(pid->calldata, PSYS_RESET_DEPSGRAPH);
- /*else if (pid->type == PTCACHE_TYPE_SMOKE_DOMAIN)
+#if 0
+ else if (pid->type == PTCACHE_TYPE_SMOKE_DOMAIN)
smokeModifier_reset(pid->calldata);
else if (pid->type == PTCACHE_TYPE_SMOKE_HIGHRES)
- smokeModifier_reset_turbulence(pid->calldata);*/
+ smokeModifier_reset_turbulence(pid->calldata);
+#endif
else if (pid->type == PTCACHE_TYPE_DYNAMICPAINT)
dynamicPaint_clearSurface((DynamicPaintSurface*)pid->calldata);
}
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2012-11-18 01:20:02 UTC (rev 52315)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2012-11-18 01:22:31 UTC (rev 52316)
@@ -1045,7 +1045,7 @@
/* always update layer, so that animating layers works (joshua july 2010) */
/* XXX commented out, this has depsgraph issues anyway - and this breaks setting scenes
- (on scene-set, the base-lay is copied to ob-lay (ton nov 2012) */
+ * (on scene-set, the base-lay is copied to ob-lay (ton nov 2012) */
// base->lay = ob->lay;
}
Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2012-11-18 01:20:02 UTC (rev 52315)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2012-11-18 01:22:31 UTC (rev 52316)
@@ -1410,7 +1410,7 @@
* Based on Tactical Optimization of Ray/Box Intersection, by Graham Fyffe
* [http://tog.acm.org/resources/RTNews/html/rtnv21n1.html#art9]
*
- * TODO this doens't has data->ray.radius in consideration */
+ * TODO this doesn't take data->ray.radius into consideration */
static float fast_ray_nearest_hit(const BVHRayCastData *data, const BVHNode *node)
{
const float *bv = node->bv;
Modified: trunk/blender/source/blender/blenlib/intern/math_rotation.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_rotation.c 2012-11-18 01:20:02 UTC (rev 52315)
+++ trunk/blender/source/blender/blenlib/intern/math_rotation.c 2012-11-18 01:22:31 UTC (rev 52316)
@@ -84,7 +84,7 @@
* \note:
* Assumes a unit quaternion?
*
- * in fact not, but you may wan't to use a unit quat, read on...
+ * in fact not, but you may want to use a unit quat, read on...
*
* Shortcut for 'q v q*' when \a v is actually a quaternion.
* This removes the need for converting a vector to a quaternion,
Modified: trunk/blender/source/blender/blenlib/intern/scanfill.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/scanfill.c 2012-11-18 01:20:02 UTC (rev 52315)
+++ trunk/blender/source/blender/blenlib/intern/scanfill.c 2012-11-18 01:22:31 UTC (rev 52316)
@@ -985,7 +985,7 @@
/* CURRENT STATUS:
- * - eve->f :1 = availalble in edges
+ * - eve->f :1 = available in edges
* - eve->xs :polynumber
* - eve->h :amount of edges connected to vertex
* - eve->tmp.v :store! original vertex number
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_iterators.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_iterators.h 2012-11-18 01:20:02 UTC (rev 52315)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_iterators.h 2012-11-18 01:22:31 UTC (rev 52316)
@@ -107,14 +107,14 @@
BMesh *bm;
void (*begin)(struct BMIter *iter);
void *(*step)(struct BMIter *iter);
- /*
+#if 0
union {
void *p;
int i;
long l;
float f;
} filter;
- */
+#endif
int count; /* note, only some iterators set this, don't rely on it */
char itype;
} BMIter;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c 2012-11-18 01:20:02 UTC (rev 52315)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c 2012-11-18 01:22:31 UTC (rev 52316)
@@ -117,7 +117,7 @@
* Vertext Smooth Laplacian
* Smooths vertices by using Laplacian smoothing propose by.
* Desbrun, et al. Implicit Fairing of Irregular Meshes using Diffusion and Curvature Flow
-*/
+ */
static BMOpDefine bmo_smooth_laplacian_vert_def = {
"smooth_laplacian_vert",
{{BMO_OP_SLOT_ELEMENT_BUF, "verts"}, //input vertices
Modified: trunk/blender/source/blender/collada/DocumentImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentImporter.cpp 2012-11-18 01:20:02 UTC (rev 52315)
+++ trunk/blender/source/blender/collada/DocumentImporter.cpp 2012-11-18 01:22:31 UTC (rev 52316)
@@ -552,8 +552,8 @@
}
/** When this method is called, the writer must handle all nodes contained in the
-* library nodes.
-* \return The writer should return true, if writing succeeded, false otherwise.*/
+ * library nodes.
+ * \return The writer should return true, if writing succeeded, false otherwise.*/
bool DocumentImporter::writeLibraryNodes(const COLLADAFW::LibraryNodes *libraryNodes)
{
if (mImportStage != General)
Modified: trunk/blender/source/blender/collada/DocumentImporter.h
===================================================================
--- trunk/blender/source/blender/collada/DocumentImporter.h 2012-11-18 01:20:02 UTC (rev 52315)
+++ trunk/blender/source/blender/collada/DocumentImporter.h 2012-11-18 01:22:31 UTC (rev 52316)
@@ -81,8 +81,8 @@
/**
* 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.
- */
+ * \param errorMessage A message containing informations about the error that occurred.
+ */
void cancel(const COLLADAFW::String& errorMessage);
/** This is the method called. The writer hast to prepare to receive data.*/
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_paint.c 2012-11-18 01:20:02 UTC (rev 52315)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_paint.c 2012-11-18 01:22:31 UTC (rev 52316)
@@ -110,7 +110,7 @@
double ocurtime; /* Used when converting to path */
float imat[4][4]; /* inverted transformation matrix applying when converting coords from screen-space
- * to region space */
+ * to region space */
float custom_color[4]; /* custom color - hack for enforcing a particular color for track/mask editing */
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2012-11-18 01:20:02 UTC (rev 52315)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2012-11-18 01:22:31 UTC (rev 52316)
@@ -1471,9 +1471,10 @@
node_shader_buts_script(layout, C, ptr);
- /* not implemented yet
+#if 0 /* not implemented yet */
if (RNA_enum_get(ptr, "mode") == NODE_SCRIPT_EXTERNAL)
- uiItemR(layout, ptr, "use_auto_update", 0, NULL, ICON_NONE);*/
+ uiItemR(layout, ptr, "use_auto_update", 0, NULL, ICON_NONE);
+#endif
}
/* only once called */
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2012-11-18 01:20:02 UTC (rev 52315)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2012-11-18 01:22:31 UTC (rev 52316)
@@ -1228,7 +1228,7 @@
hmargin = 0.035f * (x2 - x1);
vmargin = 0.035f * (y2 - y1);
- uiDrawBox(GL_LINE_LOOP, x1 + hmargin, y1+vmargin, x2 - hmargin, y2 - vmargin, 2.0f);
+ uiDrawBox(GL_LINE_LOOP, x1 + hmargin, y1 + vmargin, x2 - hmargin, y2 - vmargin, 2.0f);
}
if (ca && (ca->flag & CAM_SHOWSENSOR)) {
/* determine sensor fit, and get sensor x/y, for auto fit we
@@ -3276,7 +3276,7 @@
int i;
cpack(0x00FF0000);
glBegin(GL_LINE_LOOP);
- for(i=0; i < _bl_debug_draw_quads_tot; i ++) {
+ for (i = 0; i < _bl_debug_draw_quads_tot; i ++) {
glVertex3fv(_bl_debug_draw_quads[i][0]);
glVertex3fv(_bl_debug_draw_quads[i][1]);
glVertex3fv(_bl_debug_draw_quads[i][2]);
Modified: trunk/blender/source/blender/imbuf/intern/cineon/dpxlib.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/dpxlib.c 2012-11-18 01:20:02 UTC (rev 52315)
+++ trunk/blender/source/blender/imbuf/intern/cineon/dpxlib.c 2012-11-18 01:22:31 UTC (rev 52316)
@@ -457,7 +457,7 @@
}
/* Header should be rounded to next 8k block
- 6044 = 8092 - sizeof(DpxMainHeader) */
+ * 6044 = 8092 - sizeof(DpxMainHeader) */
memset(&pad, 0, 6044);
if (fwrite(&pad, 6044, 1, dpx->file) == 0) {
if (verbose) printf("DPX: Couldn't write image header\n");
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list