[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49451] branches/soc-2011-tomato: Merging r49413 through r49450 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Wed Aug 1 16:14:25 CEST 2012
Revision: 49451
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49451
Author: nazgul
Date: 2012-08-01 14:14:22 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
Merging r49413 through r49450 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49413
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49450
Modified Paths:
--------------
branches/soc-2011-tomato/intern/audaspace/FX/AUD_ButterworthFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_FaderFactory.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_3DMath.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_BSPNode.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_BSPTree.h
branches/soc-2011-tomato/intern/cycles/bvh/bvh.cpp
branches/soc-2011-tomato/intern/cycles/kernel/kernel_montecarlo.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_path.h
branches/soc-2011-tomato/intern/cycles/render/light.cpp
branches/soc-2011-tomato/intern/cycles/render/object.cpp
branches/soc-2011-tomato/intern/ghost/GHOST_IWindow.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/soc-2011-tomato/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/library.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_memarena.h
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CompositorNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.h
branches/soc-2011-tomato/source/blender/editors/include/ED_image.h
branches/soc-2011-tomato/source/blender/editors/include/ED_mask.h
branches/soc-2011-tomato/source/blender/editors/include/ED_node.h
branches/soc-2011-tomato/source/blender/editors/include/ED_object.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_add.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_intern.h
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_utils.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_edit.c
branches/soc-2011-tomato/source/blender/editors/space_image/space_image.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_ops.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_select.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_snap.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mask.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/soc-2011-tomato/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_DynamicTypes.h
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_IRenderTools.h
Added Paths:
-----------
branches/soc-2011-tomato/release/scripts/templates/ui_panel.py
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49412
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49450
Modified: branches/soc-2011-tomato/intern/audaspace/FX/AUD_ButterworthFactory.h
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/FX/AUD_ButterworthFactory.h 2012-08-01 13:59:08 UTC (rev 49450)
+++ branches/soc-2011-tomato/intern/audaspace/FX/AUD_ButterworthFactory.h 2012-08-01 14:14:22 UTC (rev 49451)
@@ -56,8 +56,8 @@
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__
Modified: branches/soc-2011-tomato/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h 2012-08-01 13:59:08 UTC (rev 49450)
+++ branches/soc-2011-tomato/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h 2012-08-01 14:14:22 UTC (rev 49451)
@@ -56,8 +56,8 @@
* \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__
Modified: branches/soc-2011-tomato/intern/audaspace/FX/AUD_FaderFactory.h
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/FX/AUD_FaderFactory.h 2012-08-01 13:59:08 UTC (rev 49450)
+++ branches/soc-2011-tomato/intern/audaspace/FX/AUD_FaderFactory.h 2012-08-01 14:14:22 UTC (rev 49451)
@@ -68,8 +68,8 @@
* \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.
Modified: branches/soc-2011-tomato/intern/audaspace/intern/AUD_3DMath.h
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/intern/AUD_3DMath.h 2012-08-01 13:59:08 UTC (rev 49450)
+++ branches/soc-2011-tomato/intern/audaspace/intern/AUD_3DMath.h 2012-08-01 14:14:22 UTC (rev 49451)
@@ -136,8 +136,8 @@
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);
}
/**
Modified: branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.h
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.h 2012-08-01 13:59:08 UTC (rev 49450)
+++ branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.h 2012-08-01 14:14:22 UTC (rev 49451)
@@ -442,10 +442,10 @@
* 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 @@
* \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 @@
* \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 @@
* \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
Modified: branches/soc-2011-tomato/intern/boolop/intern/BOP_BSPNode.h
===================================================================
--- branches/soc-2011-tomato/intern/boolop/intern/BOP_BSPNode.h 2012-08-01 13:59:08 UTC (rev 49450)
+++ branches/soc-2011-tomato/intern/boolop/intern/BOP_BSPNode.h 2012-08-01 14:14:22 UTC (rev 49451)
@@ -52,43 +52,43 @@
// 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
Modified: branches/soc-2011-tomato/intern/boolop/intern/BOP_BSPTree.h
===================================================================
--- branches/soc-2011-tomato/intern/boolop/intern/BOP_BSPTree.h 2012-08-01 13:59:08 UTC (rev 49450)
+++ branches/soc-2011-tomato/intern/boolop/intern/BOP_BSPTree.h 2012-08-01 14:14:22 UTC (rev 49451)
@@ -50,22 +50,22 @@
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,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list