Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/gameengine/Converter')
-rw-r--r--source/gameengine/Converter/BL_ActionActuator.h2
-rw-r--r--source/gameengine/Converter/BL_ArmatureActuator.h6
-rw-r--r--source/gameengine/Converter/BL_ArmatureChannel.h6
-rw-r--r--source/gameengine/Converter/BL_ArmatureConstraint.h5
-rw-r--r--source/gameengine/Converter/BL_ArmatureObject.h6
-rw-r--r--source/gameengine/Converter/BL_BlenderDataConversion.h3
-rw-r--r--source/gameengine/Converter/BL_DeformableGameObject.h5
-rw-r--r--source/gameengine/Converter/BL_MeshDeformer.h2
-rw-r--r--source/gameengine/Converter/BL_ModifierDeformer.h5
-rw-r--r--source/gameengine/Converter/BL_ShapeActionActuator.h5
-rw-r--r--source/gameengine/Converter/BL_ShapeDeformer.h2
-rw-r--r--source/gameengine/Converter/BL_SkinDeformer.h2
-rw-r--r--source/gameengine/Converter/BlenderWorldInfo.h3
-rw-r--r--source/gameengine/Converter/KX_BlenderScalarInterpolator.h3
-rw-r--r--source/gameengine/Converter/KX_BlenderSceneConverter.h3
-rw-r--r--source/gameengine/Converter/KX_ConvertActuators.h4
-rw-r--r--source/gameengine/Converter/KX_ConvertControllers.h4
-rw-r--r--source/gameengine/Converter/KX_ConvertProperties.h3
-rw-r--r--source/gameengine/Converter/KX_ConvertSensors.h3
-rw-r--r--source/gameengine/Converter/KX_IpoConvert.h3
-rw-r--r--source/gameengine/Converter/KX_SoftBodyDeformer.h2
21 files changed, 28 insertions, 49 deletions
diff --git a/source/gameengine/Converter/BL_ActionActuator.h b/source/gameengine/Converter/BL_ActionActuator.h
index 640a9a9ccb7..46075ea933d 100644
--- a/source/gameengine/Converter/BL_ActionActuator.h
+++ b/source/gameengine/Converter/BL_ActionActuator.h
@@ -108,7 +108,7 @@ public:
return 1;
}
}
-#endif // WITH_PYTHON
+#endif /* WITH_PYTHON */
protected:
MT_Point3 m_lastpos;
diff --git a/source/gameengine/Converter/BL_ArmatureActuator.h b/source/gameengine/Converter/BL_ArmatureActuator.h
index 0c88dccb6f3..a5af2bc9c09 100644
--- a/source/gameengine/Converter/BL_ArmatureActuator.h
+++ b/source/gameengine/Converter/BL_ArmatureActuator.h
@@ -77,7 +77,7 @@ public:
static PyObject *pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
-#endif // WITH_PYTHON
+#endif /* WITH_PYTHON */
private:
// identify the constraint that this actuator controls
@@ -93,6 +93,4 @@ private:
int m_type;
};
-#endif //__BL_ARMATUREACTUATOR_H__
-
-
+#endif /* __BL_ARMATUREACTUATOR_H__ */
diff --git a/source/gameengine/Converter/BL_ArmatureChannel.h b/source/gameengine/Converter/BL_ArmatureChannel.h
index b764d32e8a7..51114c5df30 100644
--- a/source/gameengine/Converter/BL_ArmatureChannel.h
+++ b/source/gameengine/Converter/BL_ArmatureChannel.h
@@ -68,7 +68,7 @@ public:
static int py_attr_setattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
static PyObject *py_attr_get_joint_rotation(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
static int py_attr_set_joint_rotation(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
-#endif // WITH_PYTHON
+#endif /* WITH_PYTHON */
};
/* this is a factory class to access bBone data field in the GE.
@@ -93,6 +93,4 @@ public:
};
-
-#endif //__BL_ARMATURECHANNEL_H__
-
+#endif /* __BL_ARMATURECHANNEL_H__ */
diff --git a/source/gameengine/Converter/BL_ArmatureConstraint.h b/source/gameengine/Converter/BL_ArmatureConstraint.h
index 579153a2e79..98c2954baf4 100644
--- a/source/gameengine/Converter/BL_ArmatureConstraint.h
+++ b/source/gameengine/Converter/BL_ArmatureConstraint.h
@@ -119,8 +119,7 @@ public:
static PyObject *py_attr_getattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
static int py_attr_setattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
-#endif // WITH_PYTHON
+#endif /* WITH_PYTHON */
};
-#endif //__BL_ARMATURECONSTRAINT_H__
-
+#endif /* __BL_ARMATURECONSTRAINT_H__ */
diff --git a/source/gameengine/Converter/BL_ArmatureObject.h b/source/gameengine/Converter/BL_ArmatureObject.h
index 4e7dc3df2f3..445b9af1b10 100644
--- a/source/gameengine/Converter/BL_ArmatureObject.h
+++ b/source/gameengine/Converter/BL_ArmatureObject.h
@@ -120,7 +120,7 @@ public:
static PyObject *pyattr_get_channels(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
KX_PYMETHOD_DOC_NOARGS(BL_ArmatureObject, update);
-#endif // WITH_PYTHON
+#endif /* WITH_PYTHON */
protected:
/* list element: BL_ArmatureConstraint. Use SG_DListHead to have automatic list replication */
@@ -152,6 +152,4 @@ void game_blend_poses(struct bPose *dst, struct bPose *src, float srcweight/*, s
void game_copy_pose(struct bPose **dst, struct bPose *src, int copy_con);
void game_free_pose(struct bPose *pose);
-
-#endif
-
+#endif /* __BL_ARMATUREOBJECT_H__ */
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.h b/source/gameengine/Converter/BL_BlenderDataConversion.h
index e6c35c20f4c..2a7efaac898 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.h
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.h
@@ -52,5 +52,4 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
SCA_IInputDevice::KX_EnumInputs ConvertKeyCode(int key_code);
-#endif // __BL_BLENDERDATACONVERSION_H__
-
+#endif /* __BL_BLENDERDATACONVERSION_H__ */
diff --git a/source/gameengine/Converter/BL_DeformableGameObject.h b/source/gameengine/Converter/BL_DeformableGameObject.h
index d14160d39a3..6653311d496 100644
--- a/source/gameengine/Converter/BL_DeformableGameObject.h
+++ b/source/gameengine/Converter/BL_DeformableGameObject.h
@@ -34,7 +34,7 @@
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif /* WIN32 */
#include "DNA_mesh_types.h"
#include "KX_GameObject.h"
@@ -104,5 +104,4 @@ protected:
#endif
};
-#endif
-
+#endif /* __BL_DEFORMABLEGAMEOBJECT_H__ */
diff --git a/source/gameengine/Converter/BL_MeshDeformer.h b/source/gameengine/Converter/BL_MeshDeformer.h
index c84d31c72cd..5cea4100b3f 100644
--- a/source/gameengine/Converter/BL_MeshDeformer.h
+++ b/source/gameengine/Converter/BL_MeshDeformer.h
@@ -40,7 +40,7 @@
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif /* WIN32 */
class BL_DeformableGameObject;
diff --git a/source/gameengine/Converter/BL_ModifierDeformer.h b/source/gameengine/Converter/BL_ModifierDeformer.h
index 5d0c3bc1317..f04b41df3fc 100644
--- a/source/gameengine/Converter/BL_ModifierDeformer.h
+++ b/source/gameengine/Converter/BL_ModifierDeformer.h
@@ -34,7 +34,7 @@
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif /* WIN32 */
#include "BL_ShapeDeformer.h"
#include "BL_DeformableGameObject.h"
@@ -111,5 +111,4 @@ protected:
#endif
};
-#endif
-
+#endif /* __BL_MODIFIERDEFORMER_H__ */
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.h b/source/gameengine/Converter/BL_ShapeActionActuator.h
index b88631c89d6..f72275b79cf 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.h
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.h
@@ -108,7 +108,7 @@ public:
}
-#endif // WITH_PYTHON
+#endif /* WITH_PYTHON */
protected:
@@ -141,5 +141,4 @@ protected:
struct PointerRNA *m_idptr;
};
-#endif
-
+#endif /* __BL_SHAPEACTIONACTUATOR_H__ */
diff --git a/source/gameengine/Converter/BL_ShapeDeformer.h b/source/gameengine/Converter/BL_ShapeDeformer.h
index ecf501d9a91..ff5d1e33348 100644
--- a/source/gameengine/Converter/BL_ShapeDeformer.h
+++ b/source/gameengine/Converter/BL_ShapeDeformer.h
@@ -34,7 +34,7 @@
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif /* WIN32 */
#include "BL_SkinDeformer.h"
#include "BL_DeformableGameObject.h"
diff --git a/source/gameengine/Converter/BL_SkinDeformer.h b/source/gameengine/Converter/BL_SkinDeformer.h
index 48c3c3e6186..f1e1e51dd9b 100644
--- a/source/gameengine/Converter/BL_SkinDeformer.h
+++ b/source/gameengine/Converter/BL_SkinDeformer.h
@@ -34,7 +34,7 @@
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif /* WIN32 */
#include "CTR_HashedPtr.h"
#include "BL_MeshDeformer.h"
diff --git a/source/gameengine/Converter/BlenderWorldInfo.h b/source/gameengine/Converter/BlenderWorldInfo.h
index 2cf706a3089..30de5e89269 100644
--- a/source/gameengine/Converter/BlenderWorldInfo.h
+++ b/source/gameengine/Converter/BlenderWorldInfo.h
@@ -104,5 +104,4 @@ public:
#endif
};
-#endif //__BLENDERWORLDINFO_H__
-
+#endif /* __BLENDERWORLDINFO_H__ */
diff --git a/source/gameengine/Converter/KX_BlenderScalarInterpolator.h b/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
index 980aeef7e60..d828910233f 100644
--- a/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
+++ b/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
@@ -73,5 +73,4 @@ public:
#endif
};
-#endif //__KX_BLENDERSCALARINTERPOLATOR_H__
-
+#endif /* __KX_BLENDERSCALARINTERPOLATOR_H__ */
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h
index b51c2f21ca7..436bdb555c9 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.h
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h
@@ -196,5 +196,4 @@ public:
#endif
};
-#endif //__KX_BLENDERSCENECONVERTER_H__
-
+#endif /* __KX_BLENDERSCENECONVERTER_H__ */
diff --git a/source/gameengine/Converter/KX_ConvertActuators.h b/source/gameengine/Converter/KX_ConvertActuators.h
index b7c890458cc..596c8cab936 100644
--- a/source/gameengine/Converter/KX_ConvertActuators.h
+++ b/source/gameengine/Converter/KX_ConvertActuators.h
@@ -43,6 +43,4 @@ void BL_ConvertActuators(const char* maggiename,
class RAS_IRenderTools* rendertools,
class KX_BlenderSceneConverter* converter);
-
-#endif //__KX_CONVERTACTUATORS_H__
-
+#endif /* __KX_CONVERTACTUATORS_H__ */
diff --git a/source/gameengine/Converter/KX_ConvertControllers.h b/source/gameengine/Converter/KX_ConvertControllers.h
index d1d52f866ec..817a49e1b2f 100644
--- a/source/gameengine/Converter/KX_ConvertControllers.h
+++ b/source/gameengine/Converter/KX_ConvertControllers.h
@@ -43,6 +43,4 @@ void BL_ConvertControllers(
class KX_BlenderSceneConverter* converter
);
-
-#endif //__KX_CONVERTCONTROLLERS_H__
-
+#endif /* __KX_CONVERTCONTROLLERS_H__ */
diff --git a/source/gameengine/Converter/KX_ConvertProperties.h b/source/gameengine/Converter/KX_ConvertProperties.h
index 345af3bfa74..8f96cc21af6 100644
--- a/source/gameengine/Converter/KX_ConvertProperties.h
+++ b/source/gameengine/Converter/KX_ConvertProperties.h
@@ -38,5 +38,4 @@ void BL_ConvertProperties(struct Object* object,
class SCA_IScene* scene,
bool isInActiveLayer);
-#endif //__KX_CONVERTPROPERTIES_H__
-
+#endif /* __KX_CONVERTPROPERTIES_H__ */
diff --git a/source/gameengine/Converter/KX_ConvertSensors.h b/source/gameengine/Converter/KX_ConvertSensors.h
index 0694815c77e..56248721a37 100644
--- a/source/gameengine/Converter/KX_ConvertSensors.h
+++ b/source/gameengine/Converter/KX_ConvertSensors.h
@@ -42,5 +42,4 @@ void BL_ConvertSensors(struct Object* blenderobject,
class RAS_ICanvas* canvas,
class KX_BlenderSceneConverter* converter);
-#endif //__KX_CONVERTSENSORS_H__
-
+#endif /* __KX_CONVERTSENSORS_H__ */
diff --git a/source/gameengine/Converter/KX_IpoConvert.h b/source/gameengine/Converter/KX_IpoConvert.h
index 7bb2df978f6..861a2ba66f2 100644
--- a/source/gameengine/Converter/KX_IpoConvert.h
+++ b/source/gameengine/Converter/KX_IpoConvert.h
@@ -66,5 +66,4 @@ void BL_ConvertMaterialIpos(struct Object* blenderobject,
class KX_BlenderSceneConverter *converter);
-#endif //__KX_IPOCONVERT_H__
-
+#endif /* __KX_IPOCONVERT_H__ */
diff --git a/source/gameengine/Converter/KX_SoftBodyDeformer.h b/source/gameengine/Converter/KX_SoftBodyDeformer.h
index d692d45eb18..de533f1c5ed 100644
--- a/source/gameengine/Converter/KX_SoftBodyDeformer.h
+++ b/source/gameengine/Converter/KX_SoftBodyDeformer.h
@@ -34,7 +34,7 @@
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif /* WIN32 */
#include "RAS_Deformer.h"
#include "BL_DeformableGameObject.h"