Revision: 30564
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30564
Author: nicholasbishop
Date: 2010-07-21 05:43:38 +0200 (Wed, 21 Jul 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30510:30563
Modified Paths:
--------------
branches/soc-2010-nicolasbishop/build_files/scons/tools/btools.py
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_EventDragnDrop.h
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemWin32.h
branches/soc-2010-nicolasbishop/intern/iksolver/intern/TNT/vec.h
branches/soc-2010-nicolasbishop/intern/itasc/MovingFrame.cpp
branches/soc-2010-nicolasbishop/intern/string/intern/STR_String.cpp
branches/soc-2010-nicolasbishop/release/VERSION
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/twist.png
branches/soc-2010-nicolasbishop/release/datafiles/splash.png
branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py
branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_obj.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/spine_pivot_flex.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_material.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-nicolasbishop/release/text/readme.html
branches/soc-2010-nicolasbishop/source/blender/avi/AVI_avi.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_blender.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_brush.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/action.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/brush.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/collision.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/icons.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/ipo.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/softbody.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/math_geom.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/scanfill.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/storage.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/editarmature.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/splash.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/startup.blend.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_icons.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/resources.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_add.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-nicolasbishop/source/blender/editors/metaball/mball_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_transform.c
branches/soc-2010-nicolasbishop/source/blender/editors/render/render_preview.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/screen_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/filelist.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_graph/graph_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/nla_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_state.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_text/text_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_brush_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_sdna_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_world_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/intern/makesdna.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_brush.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_image.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-nicolasbishop/source/blender/python/doc/epy/Geometry.py
branches/soc-2010-nicolasbishop/source/blender/python/generic/blf_api.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils.h
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy.c
branches/soc-2010-nicolasbishop/source/blender/render/SConscript
branches/soc-2010-nicolasbishop/source/blender/render/intern/raytrace/reorganize.h
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/texture.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-nicolasbishop/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Network/NG_NetworkScene.cpp
branches/soc-2010-nicolasbishop/source/gameengine/PyDoc/VideoTexture.py
Added Paths:
-----------
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/add.png
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/blob.png
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/blur.png
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/clone.png
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/darken.png
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/lighten.png
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/mix.png
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/multiply.png
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/smear.png
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/soften.png
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/subtract.png
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/texdraw.png
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/vertexdraw.png
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/add.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/blob.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/blur.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/clay.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/clone.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/crease.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/darken.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/draw.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/fill.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/flatten.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/grab.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/inflate.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/layer.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/lighten.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/mix.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/multiply.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/nudge.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/pinch.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/scrape.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/smear.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/smooth.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/snake_hook.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/soften.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/subtract.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/texdraw.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/thumb.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/twist.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/vertexdraw.png.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/noise.c
Modified: branches/soc-2010-nicolasbishop/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2010-nicolasbishop/build_files/scons/tools/btools.py
2010-07-21 01:39:18 UTC (rev 30563)
+++ branches/soc-2010-nicolasbishop/build_files/scons/tools/btools.py
2010-07-21 03:43:38 UTC (rev 30564)
@@ -15,7 +15,7 @@
Variables = SCons.Variables
BoolVariable = SCons.Variables.BoolVariable
-VERSION = '2.52' # This is used in creating the local config directories
+VERSION = '2.53' # This is used in creating the local config directories
def print_arguments(args, bc):
if len(args):
Modified:
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_EventDragnDrop.h
===================================================================
--- branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_EventDragnDrop.h
2010-07-21 01:39:18 UTC (rev 30563)
+++ branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_EventDragnDrop.h
2010-07-21 03:43:38 UTC (rev 30564)
@@ -69,7 +69,7 @@
* @param time The time this event was generated.
* @param type The type of this event.
* @param dataType The type of the drop candidate object
- * @param window The window where the event occured
+ * @param window The window where the event occurred
* @param x The x-coordinate of the location the
cursor was at at the time of the event.
* @param y The y-coordinate of the location the
cursor was at at the time of the event.
* @param data The "content" dropped in the window
Modified:
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCocoa.h
===================================================================
--- branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCocoa.h
2010-07-21 01:39:18 UTC (rev 30563)
+++ branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCocoa.h
2010-07-21 03:43:38 UTC (rev 30564)
@@ -155,7 +155,7 @@
* @param draggedObjectType The type object concerned (currently array
of file names, string, TIFF image)
* @param mouseX x mouse coordinate (in cocoa base window coordinates)
* @param mouseY y mouse coordinate
- * @param window The window on which the event occured
+ * @param window The window on which the event occurred
* @return Indication whether the event was handled.
*/
GHOST_TSuccess handleDraggingEvent(GHOST_TEventType eventType,
GHOST_TDragnDropTypes draggedObjectType,
@@ -236,7 +236,7 @@
/**
* Handles a window event. Called by GHOST_WindowCocoa window delegate
* @param eventType The type of window event
- * @param window The window on which the event occured
+ * @param window The window on which the event occurred
* @return Indication whether the event was handled.
*/
GHOST_TSuccess handleWindowEvent(GHOST_TEventType eventType,
GHOST_WindowCocoa* window);
Modified:
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCocoa.mm
2010-07-21 01:39:18 UTC (rev 30563)
+++ branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCocoa.mm
2010-07-21 03:43:38 UTC (rev 30564)
@@ -1550,7 +1550,7 @@
NSPoint mousePos = [event
locationInWindow];
pushEvent(new
GHOST_EventCursor([event timestamp]*1000, GHOST_kEventCursorMove, window,
mousePos.x, mousePos.y));
m_cursorDelta_x=0;
- m_cursorDelta_y=0; //Mouse
motion occured between two cursor warps, so we can reset the delta counter
+ m_cursorDelta_y=0; //Mouse
motion occurred between two cursor warps, so we can reset the delta counter
}
break;
}
Modified:
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemWin32.h
===================================================================
--- branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemWin32.h
2010-07-21 01:39:18 UTC (rev 30563)
+++ branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemWin32.h
2010-07-21 03:43:38 UTC (rev 30564)
@@ -214,7 +214,7 @@
* @param draggedObjectType The type object concerned (currently array
of file names, string, ?bitmap)
* @param mouseX x mouse coordinate (in window coordinates)
* @param mouseY y mouse coordinate
- * @param window The window on which the event occured
+ * @param window The window on which the event occurred
* @return Indication whether the event was handled.
*/
static GHOST_TSuccess pushDragDropEvent(GHOST_TEventType eventType,
GHOST_TDragnDropTypes draggedObjectType,GHOST_IWindow* window, int mouseX, int
mouseY, void* data);
Modified: branches/soc-2010-nicolasbishop/intern/iksolver/intern/TNT/vec.h
===================================================================
--- branches/soc-2010-nicolasbishop/intern/iksolver/intern/TNT/vec.h
2010-07-21 01:39:18 UTC (rev 30563)
+++ branches/soc-2010-nicolasbishop/intern/iksolver/intern/TNT/vec.h
2010-07-21 03:43:38 UTC (rev 30564)
@@ -416,7 +416,7 @@
A[i] += B[i];
}
-// same with seperate output vector
+// same with separate output vector
template <class T>
void vectoradd(
Modified: branches/soc-2010-nicolasbishop/intern/itasc/MovingFrame.cpp
===================================================================
--- branches/soc-2010-nicolasbishop/intern/itasc/MovingFrame.cpp
2010-07-21 01:39:18 UTC (rev 30563)
+++ branches/soc-2010-nicolasbishop/intern/itasc/MovingFrame.cpp
2010-07-21 03:43:38 UTC (rev 30564)
@@ -52,7 +52,7 @@
}
}
-// load pose just preceeding timestamp
+// load pose just preceding timestamp
// return false if no cache position was found
bool MovingFrame::popInternalFrame(CacheTS timestamp)
{
Modified: branches/soc-2010-nicolasbishop/intern/string/intern/STR_String.cpp
===================================================================
--- branches/soc-2010-nicolasbishop/intern/string/intern/STR_String.cpp
2010-07-21 01:39:18 UTC (rev 30563)
+++ branches/soc-2010-nicolasbishop/intern/string/intern/STR_String.cpp
2010-07-21 03:43:38 UTC (rev 30564)
@@ -359,7 +359,7 @@
//
-// Find the first occurence of <str> in the string
+// Find the first occurrence of <str> in the string
//
int STR_String::Find(const char *str, int pos) const
{
@@ -373,7 +373,7 @@
//
-// Find the first occurence of <str> in the string
+// Find the first occurrence of <str> in the string
//
int STR_String::Find(rcSTR_String str, int pos) const
{
@@ -387,7 +387,7 @@
//
-// Find the last occurence of <c> in the string
+// Find the last occurrence of <c> in the string
//
int STR_String::RFind(char c) const
{
@@ -399,7 +399,7 @@
//
-// Find the first occurence of any character in character set <set> in the
string
+// Find the first occurrence of any character in character set <set> in the
string
//
int STR_String::FindOneOf(const char *set, int pos) const
{
Modified: branches/soc-2010-nicolasbishop/release/VERSION
===================================================================
--- branches/soc-2010-nicolasbishop/release/VERSION 2010-07-21 01:39:18 UTC
(rev 30563)
+++ branches/soc-2010-nicolasbishop/release/VERSION 2010-07-21 03:43:38 UTC
(rev 30564)
@@ -1 +1 @@
-2.5-alpha2
+2.5-beta
Copied: branches/soc-2010-nicolasbishop/release/datafiles/brushicons/add.png
(from rev 30563, trunk/blender/release/datafiles/brushicons/add.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2010-nicolasbishop/release/datafiles/brushicons/blob.png
(from rev 30563, trunk/blender/release/datafiles/brushicons/blob.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2010-nicolasbishop/release/datafiles/brushicons/blur.png
(from rev 30563, trunk/blender/release/datafiles/brushicons/blur.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2010-nicolasbishop/release/datafiles/brushicons/clone.png
(from rev 30563, trunk/blender/release/datafiles/brushicons/clone.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2010-nicolasbishop/release/datafiles/brushicons/darken.png
(from rev 30563, trunk/blender/release/datafiles/brushicons/darken.png)
===================================================================
(Binary files differ)
Copied:
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/lighten.png (from
rev 30563, trunk/blender/release/datafiles/brushicons/lighten.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2010-nicolasbishop/release/datafiles/brushicons/mix.png
(from rev 30563, trunk/blender/release/datafiles/brushicons/mix.png)
===================================================================
(Binary files differ)
Copied:
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/multiply.png (from
rev 30563, trunk/blender/release/datafiles/brushicons/multiply.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2010-nicolasbishop/release/datafiles/brushicons/smear.png
(from rev 30563, trunk/blender/release/datafiles/brushicons/smear.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2010-nicolasbishop/release/datafiles/brushicons/soften.png
(from rev 30563, trunk/blender/release/datafiles/brushicons/soften.png)
===================================================================
(Binary files differ)
Copied:
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/subtract.png (from
rev 30563, trunk/blender/release/datafiles/brushicons/subtract.png)
===================================================================
(Binary files differ)
Copied:
branches/soc-2010-nicolasbishop/release/datafiles/brushicons/texdraw.png (from
rev 30563, trunk/blender/release/datafiles/brushicons/texdraw.png)
===================================================================
(Binary files differ)
Modified: branches/soc-2010-nicolasbishop/release/datafiles/brushicons/twist.png
===================================================================
(Binary files differ)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
