Revision: 51312
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51312
Author: campbellbarton
Date: 2012-10-14 08:49:01 +0000 (Sun, 14 Oct 2012)
Log Message:
-----------
code cleanup: remove redundant casts
Modified Paths:
--------------
trunk/blender/extern/libmv/third_party/ceres/CMakeLists.txt
trunk/blender/intern/dualcon/CMakeLists.txt
trunk/blender/intern/itasc/CMakeLists.txt
trunk/blender/intern/smoke/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/ikplugin/CMakeLists.txt
trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.cpp
trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h
trunk/blender/source/gameengine/Converter/BL_ModifierDeformer.cpp
trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
trunk/blender/source/gameengine/Converter/CMakeLists.txt
trunk/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
trunk/blender/source/gameengine/Physics/Bullet/CMakeLists.txt
trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.cpp
Modified: trunk/blender/extern/libmv/third_party/ceres/CMakeLists.txt
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/CMakeLists.txt 2012-10-14
07:40:16 UTC (rev 51311)
+++ trunk/blender/extern/libmv/third_party/ceres/CMakeLists.txt 2012-10-14
08:49:01 UTC (rev 51312)
@@ -28,13 +28,13 @@
set(INC
.
- ../../../Eigen3
include
internal
../gflags
)
set(INC_SYS
+ ../../../Eigen3
)
set(SRC
Modified: trunk/blender/intern/dualcon/CMakeLists.txt
===================================================================
--- trunk/blender/intern/dualcon/CMakeLists.txt 2012-10-14 07:40:16 UTC (rev
51311)
+++ trunk/blender/intern/dualcon/CMakeLists.txt 2012-10-14 08:49:01 UTC (rev
51312)
@@ -19,6 +19,9 @@
set(INC
.
intern
+)
+
+set(INC_SYS
../../extern/Eigen3
)
@@ -42,5 +45,5 @@
dualcon.h
)
-blender_add_lib(bf_intern_dualcon "${SRC}" "${INC}" "")
+blender_add_lib(bf_intern_dualcon "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/intern/itasc/CMakeLists.txt
===================================================================
--- trunk/blender/intern/itasc/CMakeLists.txt 2012-10-14 07:40:16 UTC (rev
51311)
+++ trunk/blender/intern/itasc/CMakeLists.txt 2012-10-14 08:49:01 UTC (rev
51312)
@@ -24,11 +24,11 @@
# ***** END GPL LICENSE BLOCK *****
set(INC
- ../../extern/Eigen3
+
)
set(INC_SYS
-
+ ../../extern/Eigen3
)
set(SRC
Modified: trunk/blender/intern/smoke/CMakeLists.txt
===================================================================
--- trunk/blender/intern/smoke/CMakeLists.txt 2012-10-14 07:40:16 UTC (rev
51311)
+++ trunk/blender/intern/smoke/CMakeLists.txt 2012-10-14 08:49:01 UTC (rev
51312)
@@ -26,10 +26,10 @@
set(INC
intern
../memutil
- ../../extern/bullet2/src
)
set(INC_SYS
+ ../../extern/bullet2/src
${PNG_INCLUDE_DIR}
${ZLIB_INCLUDE_DIRS}
)
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2012-10-14
07:40:16 UTC (rev 51311)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2012-10-14
08:49:01 UTC (rev 51312)
@@ -249,7 +249,7 @@
endif()
if(WITH_BULLET)
- list(APPEND INC
+ list(APPEND INC_SYS
../../../extern/bullet2/src
)
add_definitions(-DUSE_BULLET)
Modified: trunk/blender/source/blender/ikplugin/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/ikplugin/CMakeLists.txt 2012-10-14
07:40:16 UTC (rev 51311)
+++ trunk/blender/source/blender/ikplugin/CMakeLists.txt 2012-10-14
08:49:01 UTC (rev 51312)
@@ -56,9 +56,11 @@
if(WITH_IK_ITASC)
add_definitions(-DWITH_IK_ITASC)
list(APPEND INC
- ../../../extern/Eigen3
../../../intern/itasc
)
+ list(APPEND INC_SYS
+ ../../../extern/Eigen3
+ )
list(APPEND SRC
intern/itasc_plugin.cpp
intern/itasc_plugin.h
Modified: trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
2012-10-14 07:40:16 UTC (rev 51311)
+++ trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
2012-10-14 08:49:01 UTC (rev 51312)
@@ -23,7 +23,6 @@
../../blender/makesdna
../../blender/makesrna
../../blender/windowmanager
- ../../../extern/bullet2/src
../../../intern/container
../../../intern/guardedalloc
../../../intern/moto/include
@@ -31,6 +30,7 @@
)
set(INC_SYS
+ ../../../extern/bullet2/src
${PTHREADS_INCLUDE_DIRS}
${GLEW_INCLUDE_PATH}
)
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
2012-10-14 07:40:16 UTC (rev 51311)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
2012-10-14 08:49:01 UTC (rev 51312)
@@ -119,14 +119,14 @@
int KX_BlenderCanvas::GetMouseX(int x)
{
- float left = GetWindowArea().GetLeft();
- return float(x - (left - m_area_left));
+ int left = GetWindowArea().GetLeft();
+ return x - (left - m_area_left);
}
int KX_BlenderCanvas::GetMouseY(int y)
{
- float top = GetWindowArea().GetTop();
- return float(y - (m_area_top - top));
+ int top = GetWindowArea().GetTop();
+ return y - (m_area_top - top);
}
float KX_BlenderCanvas::GetMouseNormalizedX(int x)
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
2012-10-14 07:40:16 UTC (rev 51311)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
2012-10-14 08:49:01 UTC (rev 51312)
@@ -192,8 +192,8 @@
struct wmWindow* m_win;
RAS_Rect m_frame_rect;
RAS_Rect m_area_rect;
- short m_area_left;
- short m_area_top;
+ int m_area_left;
+ int m_area_top;
#ifdef WITH_CXX_GUARDEDALLOC
Modified: trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.cpp
2012-10-14 07:40:16 UTC (rev 51311)
+++ trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.cpp
2012-10-14 08:49:01 UTC (rev 51312)
@@ -455,12 +455,12 @@
Bone* bone = reinterpret_cast<Bone*>(self);
Bone* child;
int count = 0;
- for (child=(Bone*)bone->childbase.first; child;
child=(Bone*)child->next)
+ for (child = (Bone *)bone->childbase.first; child; child = child->next)
count++;
PyObject *childrenlist = PyList_New(count);
- for (count = 0, child=(Bone*)bone->childbase.first; child;
child=(Bone*)child->next, ++count)
+ for (count = 0, child = (Bone *)bone->childbase.first; child; child =
child->next, ++count)
PyList_SET_ITEM(childrenlist,count,NewProxyPlus_Ext(NULL,&Type,child,false));
return childrenlist;
Modified: trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
2012-10-14 07:40:16 UTC (rev 51311)
+++ trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
2012-10-14 08:49:01 UTC (rev 51312)
@@ -105,7 +105,7 @@
for (; pchan; pchan=pchan->next, outpchan=outpchan->next)
BLI_ghash_insert(ghash, pchan, outpchan);
- for (pchan=(bPoseChannel*)out->chanbase.first; pchan;
pchan=(bPoseChannel*)pchan->next) {
+ for (pchan = (bPoseChannel*)out->chanbase.first; pchan; pchan =
pchan->next) {
pchan->parent= (bPoseChannel*)BLI_ghash_lookup(ghash,
pchan->parent);
pchan->child= (bPoseChannel*)BLI_ghash_lookup(ghash,
pchan->child);
@@ -186,7 +186,10 @@
if (schan->rotmode)
dchan->eul[i] = (dchan->eul[i]*dstweight) +
(schan->eul[i]*srcweight);
}
- for (dcon= (bConstraint*)dchan->constraints.first, scon=
(bConstraint*)schan->constraints.first; dcon && scon; dcon=
(bConstraint*)dcon->next, scon= (bConstraint*)scon->next) {
+ for (dcon= (bConstraint *)dchan->constraints.first, scon=
(bConstraint *)schan->constraints.first;
+ dcon && scon;
+ dcon = dcon->next, scon = scon->next)
+ {
/* no 'add' option for constraint blending */
dcon->enforce= dcon->enforce*(1.0f-srcweight) +
scon->enforce*srcweight;
}
@@ -282,8 +285,8 @@
KX_GameObject* gamesubtarget;
// and locate the constraint
- for (pchan = (bPoseChannel*)m_pose->chanbase.first; pchan;
pchan=(bPoseChannel*)pchan->next) {
- for (pcon = (bConstraint*)pchan->constraints.first; pcon;
pcon=(bConstraint*)pcon->next) {
+ for (pchan = (bPoseChannel *)m_pose->chanbase.first; pchan; pchan =
pchan->next) {
+ for (pcon = (bConstraint *)pchan->constraints.first; pcon; pcon
= pcon->next) {
if (pcon->flag & CONSTRAINT_DISABLE)
continue;
// which constraint should we support?
@@ -315,7 +318,7 @@
}
if (target->next != NULL) {
// secondary target
- target =
(bConstraintTarget*)target->next;
+ target = target->next;
if (target->tar &&
target->tar != m_objArma) {
// only track
external object
blendtarget =
target->tar;
Modified: trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h 2012-10-14
07:40:16 UTC (rev 51311)
+++ trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h 2012-10-14
08:49:01 UTC (rev 51312)
@@ -70,7 +70,7 @@
virtual RAS_Deformer* GetReplica() {return NULL;}
virtual void ProcessReplica();
struct Mesh* GetMesh() { return m_bmesh; }
- virtual class RAS_MeshObject* GetRasMesh() { return
(RAS_MeshObject*)m_pMeshObject; }
+ virtual class RAS_MeshObject* GetRasMesh() { return m_pMeshObject; }
virtual float (* GetTransVerts(int *tot))[3] { *tot= m_tvtot;
return m_transverts; }
// virtual void InitDeform(double time) {}
Modified: trunk/blender/source/gameengine/Converter/BL_ModifierDeformer.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ModifierDeformer.cpp
2012-10-14 07:40:16 UTC (rev 51311)
+++ trunk/blender/source/gameengine/Converter/BL_ModifierDeformer.cpp
2012-10-14 08:49:01 UTC (rev 51312)
@@ -113,7 +113,7 @@
if ((ob->gameflag & OB_SOFT_BODY) != 0)
return false;
ModifierData* md;
- for (md = (ModifierData*)ob->modifiers.first; md; md =
(ModifierData*)md->next) {
+ for (md = (ModifierData *)ob->modifiers.first; md; md = md->next) {
if (modifier_dependsOnTime(md))
continue;
if (!(md->mode & eModifierMode_Realtime))
Modified: trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
2012-10-14 07:40:16 UTC (rev 51311)
+++ trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
2012-10-14 08:49:01 UTC (rev 51312)
@@ -72,7 +72,7 @@
short flags = ARM_DEF_VGROUP;
ModifierData *md;
- for (md = (ModifierData*)bmeshobj->modifiers.first; md; md =
(ModifierData*)md->next)
+ for (md = (ModifierData *)bmeshobj->modifiers.first; md; md = md->next)
{
if (md->type == eModifierType_Armature)
{
@@ -249,7 +249,7 @@
int i;
for (i=0, dg=(bDeformGroup*)m_objMesh->defbase.first;
dg;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
