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
path: root/intern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-08-01 03:06:12 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-08-01 03:06:12 +0400
commita199ae5368fa4a1de36f62dbb214a051b3fbe0c3 (patch)
tree12c5021085ec3ac707ebc7855112bab3120f268f /intern
parenta70a48814e16ffd063231577e1a120e1c2629675 (diff)
style cleanup: whitespace, also add '?' to save over popup since it wasnt totally clear it was a question (user pointed this out, they thought it was just notification and lost their work).
Diffstat (limited to 'intern')
-rw-r--r--intern/audaspace/FX/AUD_ButterworthFactory.h4
-rw-r--r--intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h4
-rw-r--r--intern/audaspace/FX/AUD_FaderFactory.h4
-rw-r--r--intern/audaspace/intern/AUD_3DMath.h4
-rw-r--r--intern/audaspace/intern/AUD_C-API.h16
-rw-r--r--intern/boolop/intern/BOP_BSPNode.h64
-rw-r--r--intern/boolop/intern/BOP_BSPTree.h32
-rw-r--r--intern/cycles/kernel/kernel_montecarlo.h4
-rw-r--r--intern/ghost/GHOST_IWindow.h2
9 files changed, 67 insertions, 67 deletions
diff --git a/intern/audaspace/FX/AUD_ButterworthFactory.h b/intern/audaspace/FX/AUD_ButterworthFactory.h
index d3606270154..dc8b4d92775 100644
--- a/intern/audaspace/FX/AUD_ButterworthFactory.h
+++ b/intern/audaspace/FX/AUD_ButterworthFactory.h
@@ -56,8 +56,8 @@ public:
AUD_ButterworthFactory(AUD_Reference<AUD_IFactory> factory, float frequency);
virtual void recalculateCoefficients(AUD_SampleRate rate,
- std::vector<float>& b,
- std::vector<float>& a);
+ std::vector<float>& b,
+ std::vector<float>& a);
};
#endif //__AUD_BUTTERWORTHFACTORY_H__
diff --git a/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h b/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
index fef379f68b1..5b297db2d56 100644
--- a/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
+++ b/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
@@ -56,8 +56,8 @@ public:
* \param[out] a The output filter coefficients.
*/
virtual void recalculateCoefficients(AUD_SampleRate rate,
- std::vector<float>& b,
- std::vector<float>& a)=0;
+ std::vector<float>& b,
+ std::vector<float>& a)=0;
};
#endif // __AUD_DYNAMICIIRFILTERFACTORY_H__
diff --git a/intern/audaspace/FX/AUD_FaderFactory.h b/intern/audaspace/FX/AUD_FaderFactory.h
index 8fcd4baa623..82eaf2fae9f 100644
--- a/intern/audaspace/FX/AUD_FaderFactory.h
+++ b/intern/audaspace/FX/AUD_FaderFactory.h
@@ -68,8 +68,8 @@ public:
* \param length How long fading should last in seconds.
*/
AUD_FaderFactory(AUD_Reference<AUD_IFactory> factory,
- AUD_FadeType type = AUD_FADE_IN,
- float start = 0.0f, float length = 1.0f);
+ AUD_FadeType type = AUD_FADE_IN,
+ float start = 0.0f, float length = 1.0f);
/**
* Returns the fading type.
diff --git a/intern/audaspace/intern/AUD_3DMath.h b/intern/audaspace/intern/AUD_3DMath.h
index f39566958cd..1b109ebee1e 100644
--- a/intern/audaspace/intern/AUD_3DMath.h
+++ b/intern/audaspace/intern/AUD_3DMath.h
@@ -136,8 +136,8 @@ public:
inline AUD_Vector3 cross(const AUD_Vector3& op) const
{
return AUD_Vector3(m_y * op.m_z - m_z * op.m_y,
- m_z * op.m_x - m_x * op.m_z,
- m_x * op.m_y - m_y * op.m_x);
+ m_z * op.m_x - m_x * op.m_z,
+ m_x * op.m_y - m_y * op.m_x);
}
/**
diff --git a/intern/audaspace/intern/AUD_C-API.h b/intern/audaspace/intern/AUD_C-API.h
index 66e6984c71b..6af0c648d0e 100644
--- a/intern/audaspace/intern/AUD_C-API.h
+++ b/intern/audaspace/intern/AUD_C-API.h
@@ -442,10 +442,10 @@ extern void AUD_closeReadDevice(AUD_Device* device);
* The sound is therefore bandpassed, rectified and resampled.
*/
extern float* AUD_readSoundBuffer(const char* filename, float low, float high,
- float attack, float release, float threshold,
- int accumulate, int additive, int square,
- float sthreshold, double samplerate,
- int* length);
+ float attack, float release, float threshold,
+ int accumulate, int additive, int square,
+ float sthreshold, double samplerate,
+ int* length);
/**
* Pauses a playing sound after a specific amount of time.
@@ -493,7 +493,7 @@ extern void AUD_setSequencerFPS(AUD_Sound* sequencer, float fps);
* \return The entry added.
*/
extern AUD_SEntry* AUD_addSequence(AUD_Sound* sequencer, AUD_Sound* sound,
- float begin, float end, float skip);
+ float begin, float end, float skip);
/**
* Removes an entry from the scene.
@@ -567,8 +567,8 @@ extern void AUD_setSequencerAnimData(AUD_Sound* sequencer, AUD_AnimateableProper
* \param cone_volume_outer The volume outside the outer cone.
*/
extern void AUD_updateSequenceData(AUD_SEntry* entry, float volume_max, float volume_min,
- float distance_max, float distance_reference, float attenuation,
- float cone_angle_outer, float cone_angle_inner, float cone_volume_outer);
+ float distance_max, float distance_reference, float attenuation,
+ float cone_angle_outer, float cone_angle_inner, float cone_volume_outer);
/**
* Updates all non-animated parameters of the entry.
@@ -578,7 +578,7 @@ extern void AUD_updateSequenceData(AUD_SEntry* entry, float volume_max, float vo
* \param model The distance model for distance calculation.
*/
extern void AUD_updateSequencerData(AUD_Sound* sequencer, float speed_of_sound,
- float factor, AUD_DistanceModel model);
+ float factor, AUD_DistanceModel model);
/**
* Sets the audio output specification of the sound scene to the specs of the
diff --git a/intern/boolop/intern/BOP_BSPNode.h b/intern/boolop/intern/BOP_BSPNode.h
index e8646cd904c..6c110416dd7 100644
--- a/intern/boolop/intern/BOP_BSPNode.h
+++ b/intern/boolop/intern/BOP_BSPNode.h
@@ -52,43 +52,43 @@ public:
// Construction methods
BOP_BSPNode(const MT_Plane3& plane);
~BOP_BSPNode();
- unsigned int addFace(const BOP_BSPPoints& pts,
- const MT_Plane3& plane);
- BOP_TAG classifyFace(const MT_Point3& p1,
- const MT_Point3& p2,
- const MT_Point3& p3,
- const MT_Plane3& plane) const;
- BOP_TAG simplifiedClassifyFace(const MT_Point3& p1,
- const MT_Point3& p2,
- const MT_Point3& p3,
- const MT_Plane3& plane) const;
+ unsigned int addFace(const BOP_BSPPoints& pts,
+ const MT_Plane3& plane);
+ BOP_TAG classifyFace(const MT_Point3& p1,
+ const MT_Point3& p2,
+ const MT_Point3& p3,
+ const MT_Plane3& plane) const;
+ BOP_TAG simplifiedClassifyFace(const MT_Point3& p1,
+ const MT_Point3& p2,
+ const MT_Point3& p3,
+ const MT_Plane3& plane) const;
protected:
BOP_TAG testPoint(const MT_Point3& p) const;
- BOP_TAG classifyFaceIN(const MT_Point3& p1,
- const MT_Point3& p2,
- const MT_Point3& p3,
- const MT_Plane3& plane) const;
- BOP_TAG classifyFaceOUT(const MT_Point3& p1,
- const MT_Point3& p2,
- const MT_Point3& p3,
- const MT_Plane3& plane) const;
- BOP_TAG simplifiedClassifyFaceIN(const MT_Point3& p1,
- const MT_Point3& p2,
- const MT_Point3& p3,
- const MT_Plane3& plane) const;
- BOP_TAG simplifiedClassifyFaceOUT(const MT_Point3& p1,
- const MT_Point3& p2,
- const MT_Point3& p3,
- const MT_Plane3& plane) const;
+ BOP_TAG classifyFaceIN(const MT_Point3& p1,
+ const MT_Point3& p2,
+ const MT_Point3& p3,
+ const MT_Plane3& plane) const;
+ BOP_TAG classifyFaceOUT(const MT_Point3& p1,
+ const MT_Point3& p2,
+ const MT_Point3& p3,
+ const MT_Plane3& plane) const;
+ BOP_TAG simplifiedClassifyFaceIN(const MT_Point3& p1,
+ const MT_Point3& p2,
+ const MT_Point3& p3,
+ const MT_Plane3& plane) const;
+ BOP_TAG simplifiedClassifyFaceOUT(const MT_Point3& p1,
+ const MT_Point3& p2,
+ const MT_Point3& p3,
+ const MT_Plane3& plane) const;
bool hasSameOrientation(const MT_Plane3& plane) const;
int compChildren() const;
- int splitTriangle(MT_Point3* res,
- const MT_Plane3& plane,
- const MT_Point3& p1,
- const MT_Point3& p2,
- const MT_Point3& p3,
- const BOP_TAG tag) const;
+ int splitTriangle(MT_Point3* res,
+ const MT_Plane3& plane,
+ const MT_Point3& p1,
+ const MT_Point3& p2,
+ const MT_Point3& p3,
+ const BOP_TAG tag) const;
public:
// Inline acces methods
diff --git a/intern/boolop/intern/BOP_BSPTree.h b/intern/boolop/intern/BOP_BSPTree.h
index b3abd55bf2a..5dc55e47175 100644
--- a/intern/boolop/intern/BOP_BSPTree.h
+++ b/intern/boolop/intern/BOP_BSPTree.h
@@ -50,22 +50,22 @@ public:
virtual ~BOP_BSPTree();
void addMesh(BOP_Mesh* mesh, BOP_Faces& facesList);
void addFace(BOP_Mesh* mesh, BOP_Face* face);
- virtual void addFace(const MT_Point3& p1,
- const MT_Point3& p2,
- const MT_Point3& p3,
- const MT_Plane3& plane);
- BOP_TAG classifyFace(const MT_Point3& p1,
- const MT_Point3& p2,
- const MT_Point3& p3,
- const MT_Plane3& plane) const;
- BOP_TAG filterFace(const MT_Point3& p1,
- const MT_Point3& p2,
- const MT_Point3& p3,
- BOP_Face* face);
- BOP_TAG simplifiedClassifyFace(const MT_Point3& p1,
- const MT_Point3& p2,
- const MT_Point3& p3,
- const MT_Plane3& plane) const;
+ virtual void addFace(const MT_Point3& p1,
+ const MT_Point3& p2,
+ const MT_Point3& p3,
+ const MT_Plane3& plane);
+ BOP_TAG classifyFace(const MT_Point3& p1,
+ const MT_Point3& p2,
+ const MT_Point3& p3,
+ const MT_Plane3& plane) const;
+ BOP_TAG filterFace(const MT_Point3& p1,
+ const MT_Point3& p2,
+ const MT_Point3& p3,
+ BOP_Face* face);
+ BOP_TAG simplifiedClassifyFace(const MT_Point3& p1,
+ const MT_Point3& p2,
+ const MT_Point3& p3,
+ const MT_Plane3& plane) const;
unsigned int getDeep() const;
void print();
inline void setRoot(BOP_BSPNode* root) {m_root=root;};
diff --git a/intern/cycles/kernel/kernel_montecarlo.h b/intern/cycles/kernel/kernel_montecarlo.h
index 939f3915b6c..afc53b1117a 100644
--- a/intern/cycles/kernel/kernel_montecarlo.h
+++ b/intern/cycles/kernel/kernel_montecarlo.h
@@ -87,8 +87,8 @@ __device_inline void sample_cos_hemisphere(const float3 N,
}
__device_inline void sample_uniform_hemisphere(const float3 N,
- float randu, float randv,
- float3 *omega_in, float *pdf)
+ float randu, float randv,
+ float3 *omega_in, float *pdf)
{
float z = randu;
float r = sqrtf(max(0.0f, 1.0f - z*z));
diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h
index 5005718e4a5..b606294e97d 100644
--- a/intern/ghost/GHOST_IWindow.h
+++ b/intern/ghost/GHOST_IWindow.h
@@ -278,7 +278,7 @@ public:
GHOST_TUns8 mask[16][2],
int hotX,
int hotY) = 0;
-
+
virtual GHOST_TSuccess setCustomCursorShape(GHOST_TUns8 *bitmap,
GHOST_TUns8 *mask,
int sizex, int sizey,