Revision: 39815
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39815
Author: campbellbarton
Date: 2011-08-31 01:07:55 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
typo fix: end of lines ;; --> ;
Modified Paths:
--------------
trunk/blender/intern/audaspace/intern/AUD_SoftwareDevice.cpp
trunk/blender/intern/ghost/intern/GHOST_Path-api.cpp
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenlib/intern/math_matrix.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/python/intern/bpy_intern_string.c
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/GameLogic/SCA_ISensor.h
trunk/blender/source/gameengine/VideoTexture/FilterColor.h
trunk/blender/source/gameengine/VideoTexture/ImageMix.cpp
Modified: trunk/blender/intern/audaspace/intern/AUD_SoftwareDevice.cpp
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_SoftwareDevice.cpp
2011-08-31 01:05:40 UTC (rev 39814)
+++ trunk/blender/intern/audaspace/intern/AUD_SoftwareDevice.cpp
2011-08-31 01:07:55 UTC (rev 39815)
@@ -516,7 +516,7 @@
float AUD_SoftwareDevice::AUD_SoftwareHandle::getVolumeMinimum()
{
if(!m_status)
- return std::numeric_limits<float>::quiet_NaN();;
+ return std::numeric_limits<float>::quiet_NaN();
return m_volume_min;
}
@@ -634,7 +634,7 @@
float AUD_SoftwareDevice::AUD_SoftwareHandle::getConeVolumeOuter()
{
if(!m_status)
- return std::numeric_limits<float>::quiet_NaN();;
+ return std::numeric_limits<float>::quiet_NaN();
return m_cone_volume_outer;
}
Modified: trunk/blender/intern/ghost/intern/GHOST_Path-api.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_Path-api.cpp 2011-08-31
01:05:40 UTC (rev 39814)
+++ trunk/blender/intern/ghost/intern/GHOST_Path-api.cpp 2011-08-31
01:07:55 UTC (rev 39815)
@@ -39,7 +39,7 @@
GHOST_TSuccess GHOST_CreateSystemPaths(void)
{
- return GHOST_ISystemPaths::create();;
+ return GHOST_ISystemPaths::create();
}
GHOST_TSuccess GHOST_DisposeSystemPaths(void)
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2011-08-31
01:05:40 UTC (rev 39814)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2011-08-31
01:07:55 UTC (rev 39815)
@@ -1091,7 +1091,7 @@
VECADDMUL(cloth1->verts[collpair->ap1].impulse,
pimpulse, w1*2.0);
VECADDMUL(cloth1->verts[collpair->ap2].impulse,
pimpulse, w2*2.0);
- VECADDMUL(cloth1->verts[collpair->ap3].impulse,
pimpulse, w3*2.0);;
+ VECADDMUL(cloth1->verts[collpair->ap3].impulse,
pimpulse, w3*2.0);
cloth1->verts[collpair->ap1].impulse_count++;
cloth1->verts[collpair->ap2].impulse_count++;
cloth1->verts[collpair->ap3].impulse_count++;
Modified: trunk/blender/source/blender/blenlib/intern/math_matrix.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_matrix.c 2011-08-31
01:05:40 UTC (rev 39814)
+++ trunk/blender/source/blender/blenlib/intern/math_matrix.c 2011-08-31
01:07:55 UTC (rev 39815)
@@ -820,7 +820,7 @@
len= normalize_v3_v3(rmat[1], mat[1]);
if(len!=0.0f) rmat[1][3]= mat[1][3] / len;
len= normalize_v3_v3(rmat[2], mat[2]);
- if(len!=0.0f) rmat[2][3]= mat[2][3] / len;;
+ if(len!=0.0f) rmat[2][3]= mat[2][3] / len;
}
void adjoint_m3_m3(float m1[][3], float m[][3])
Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c
2011-08-31 01:05:40 UTC (rev 39814)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c
2011-08-31 01:07:55 UTC (rev 39815)
@@ -3677,7 +3677,7 @@
{
Object *ob = (Object *)ptr->id.data;
PointerRNA settings_ptr;
- uiLayout *row, *subrow, *col;;
+ uiLayout *row, *subrow, *col;
RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob,
&settings_ptr);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2011-08-31 01:05:40 UTC (rev 39814)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2011-08-31 01:07:55 UTC (rev 39815)
@@ -3475,7 +3475,7 @@
copy_m3_m4(nmat, mat);
normalize_m3(nmat);
- mul_m3_v3(nmat, vec);;
+ mul_m3_v3(nmat, vec);
sub_v3_v3(ofs, vec);
}
}
Modified: trunk/blender/source/blender/python/intern/bpy_intern_string.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_intern_string.c
2011-08-31 01:05:40 UTC (rev 39814)
+++ trunk/blender/source/blender/python/intern/bpy_intern_string.c
2011-08-31 01:07:55 UTC (rev 39815)
@@ -40,7 +40,7 @@
void bpy_intern_string_init(void)
{
bpy_intern_str_register= PyUnicode_FromString("register");
- bpy_intern_str_unregister= PyUnicode_FromString("unregister");;
+ bpy_intern_str_unregister= PyUnicode_FromString("unregister");
bpy_intern_str_bl_rna= PyUnicode_FromString("bl_rna");
bpy_intern_str_order= PyUnicode_FromString("order");
bpy_intern_str_attr= PyUnicode_FromString("attr");
Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2011-08-31 01:05:40 UTC (rev 39814)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2011-08-31 01:07:55 UTC (rev 39815)
@@ -1483,7 +1483,7 @@
{
objprop.m_gamesoftFlag = OB_BSB_BENDING_CONSTRAINTS |
OB_BSB_SHAPE_MATCHING | OB_BSB_AERO_VPOINT;
- objprop.m_soft_linStiff = 0.5;;
+ objprop.m_soft_linStiff = 0.5;
objprop.m_soft_angStiff = 1.f; /* angular
stiffness 0..1 */
objprop.m_soft_volume= 1.f; /*
volume preservation 0..1 */
Modified: trunk/blender/source/gameengine/GameLogic/SCA_ISensor.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_ISensor.h 2011-08-31
01:05:40 UTC (rev 39814)
+++ trunk/blender/source/gameengine/GameLogic/SCA_ISensor.h 2011-08-31
01:07:55 UTC (rev 39815)
@@ -105,7 +105,7 @@
};
SCA_ISensor(SCA_IObject* gameobj,
- class SCA_EventManager* eventmgr);;
+ class SCA_EventManager* eventmgr);
~SCA_ISensor();
virtual void ReParent(SCA_IObject* parent);
Modified: trunk/blender/source/gameengine/VideoTexture/FilterColor.h
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/FilterColor.h 2011-08-31
01:05:40 UTC (rev 39814)
+++ trunk/blender/source/gameengine/VideoTexture/FilterColor.h 2011-08-31
01:07:55 UTC (rev 39815)
@@ -141,7 +141,7 @@
/// calculate one color component
unsigned int calcColor (unsigned int val, short idx)
{
- unsigned int col = VT_C(val,idx);;
+ unsigned int col = VT_C(val,idx);
if (col <= levels[idx][0]) col = 0;
else if (col >= levels[idx][1]) col = 0xFF;
else col = (((col - levels[idx][0]) << 8) / levels[idx][2]) &
0xFF;
Modified: trunk/blender/source/gameengine/VideoTexture/ImageMix.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/ImageMix.cpp 2011-08-31
01:05:40 UTC (rev 39814)
+++ trunk/blender/source/gameengine/VideoTexture/ImageMix.cpp 2011-08-31
01:07:55 UTC (rev 39815)
@@ -135,7 +135,7 @@
if (!getImageMix(self)->setWeight(id, weight))
{
// if not set, report error
- PyErr_SetString(PyExc_RuntimeError, "Invalid id of
source");;
+ PyErr_SetString(PyExc_RuntimeError, "Invalid id of
source");
return NULL;
}
// return none
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
