Revision: 49264
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49264
Author: nazgul
Date: 2012-07-26 18:05:42 +0000 (Thu, 26 Jul 2012)
Log Message:
-----------
Merging r49261 through r49263 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49261
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49263
Modified Paths:
--------------
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_Window.h
branches/soc-2011-tomato/intern/itasc/kdl/utilities/utility_io.cpp
branches/soc-2011-tomato/intern/memutil/MEM_RefCountPtr.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenlib/intern/freetypefont.c
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_ID.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_FramingManager.h
branches/soc-2011-tomato/source/tools/spell_check_source.py
branches/soc-2011-tomato/source/tools/spell_check_source_config.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-49260
+
/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-49263
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.cpp
2012-07-26 18:05:05 UTC (rev 49263)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.cpp
2012-07-26 18:05:42 UTC (rev 49264)
@@ -1479,7 +1479,7 @@
XFree(buffer);
- /* if we have come this far, the propery contains
+ /* if we have come this far, the property contains
* text, we know the size. */
XGetWindowProperty(m_display, win, m_xclip_out, 0,
(long) pty_size,
False, AnyPropertyType, &pty_type,
&pty_format,
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_Window.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_Window.h 2012-07-26
18:05:05 UTC (rev 49263)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_Window.h 2012-07-26
18:05:42 UTC (rev 49264)
@@ -335,7 +335,7 @@
/** Modified state : are there unsaved changes */
bool m_isUnsavedChanges;
- /** Stores wether this is a full screen window. */
+ /** Stores whether this is a full screen window. */
bool m_fullScreen;
/** Stereo visual created. Only necessary for 'real' stereo support,
Modified: branches/soc-2011-tomato/intern/itasc/kdl/utilities/utility_io.cpp
===================================================================
--- branches/soc-2011-tomato/intern/itasc/kdl/utilities/utility_io.cpp
2012-07-26 18:05:05 UTC (rev 49263)
+++ branches/soc-2011-tomato/intern/itasc/kdl/utilities/utility_io.cpp
2012-07-26 18:05:42 UTC (rev 49264)
@@ -106,7 +106,7 @@
// Eats whites, returns, tabs and the delim character
-// Checks wether delim char. is encountered.
+// Checks whether delim char. is encountered.
void Eat( std::istream& is, int delim )
{
int ch;
@@ -119,7 +119,7 @@
}
// Eats whites, returns, tabs and the delim character
-// Checks wether delim char. is encountered.
+// Checks whether delim char. is encountered.
// EatEnd does not eat all space-like char's at the end.
void EatEnd( std::istream& is, int delim )
{
Modified: branches/soc-2011-tomato/intern/memutil/MEM_RefCountPtr.h
===================================================================
--- branches/soc-2011-tomato/intern/memutil/MEM_RefCountPtr.h 2012-07-26
18:05:05 UTC (rev 49263)
+++ branches/soc-2011-tomato/intern/memutil/MEM_RefCountPtr.h 2012-07-26
18:05:42 UTC (rev 49264)
@@ -130,7 +130,7 @@
/**
* Protected constructors
- * This class is not for direct instanciation. Sub classes
+ * This class is not for direct instantiation. Sub classes
* should only be allocated on the heap.
*/
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
2012-07-26 18:05:05 UTC (rev 49263)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
2012-07-26 18:05:42 UTC (rev 49264)
@@ -1066,7 +1066,7 @@
int use_jitter = brush->jitter != 0;
/* jitter-ed brush gives weird and unpredictable result for this
- * kinds of stroke, so manyally disable jitter usage (sergey) */
+ * kinds of stroke, so manually disable jitter usage (sergey) */
use_jitter &= (brush->flag & (BRUSH_RESTORE_MESH | BRUSH_ANCHORED)) ==
0;
if (use_jitter) {
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
2012-07-26 18:05:05 UTC (rev 49263)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
2012-07-26 18:05:42 UTC (rev 49264)
@@ -3309,7 +3309,7 @@
if (ob->softflag & OB_SB_GOAL) {bp->goal = sb->defgoal;}
}
- /* to proove the concept
+ /* to proof the concept
* this enables per vertex *mass painting*
*/
@@ -3798,7 +3798,7 @@
/* vertexCos came from local world, go global */
mul_m4_v3(ob->obmat, bp->origE);
/* just to be save give bp->origT a defined value
- * will be calulated in interpolate_exciter()*/
+ * will be calculated in interpolate_exciter() */
copy_v3_v3(bp->origT, bp->origE);
}
}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
2012-07-26 18:05:05 UTC (rev 49263)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
2012-07-26 18:05:42 UTC (rev 49264)
@@ -853,7 +853,7 @@
fp[1] = (stroke_points[i].y -
marker->search_min[1]) * frame_height / mask_height;
}
- /* TODO: add an option to control wether AA is
enabled or not */
+ /* TODO: add an option to control whether AA is
enabled or not */
PLX_raskterize((float (*)[2])mask_points,
stroke->totpoints, mask, mask_width, mask_height, FALSE);
MEM_freeN(mask_points);
Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/freetypefont.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/freetypefont.c
2012-07-26 18:05:05 UTC (rev 49263)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/freetypefont.c
2012-07-26 18:05:42 UTC (rev 49264)
@@ -556,7 +556,7 @@
* Type1 format.
*
* Each arc is described through a series of start, end and control points.
Each point of the outline
- * has a specific tag which indicates wether it is used to describe a line
segment or an arc.
+ * has a specific tag which indicates whether it is used to describe a line
segment or an arc.
*
*
* The following rules are applied to decompose the contour's points into
segments and arcs :
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
2012-07-26 18:05:05 UTC (rev 49263)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
2012-07-26 18:05:42 UTC (rev 49264)
@@ -47,7 +47,7 @@
this->relative = false;
}
-void TrackPositionOperation::executePixel(float *outputValue, float x, float
y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+void TrackPositionOperation::executePixel(float *outputValue, float x, float
y, PixelSampler sampler)
{
MovieClipUser user = {0};
MovieTracking *tracking = &movieClip->tracking;
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TrackPositionOperation.h
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TrackPositionOperation.h
2012-07-26 18:05:05 UTC (rev 49263)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TrackPositionOperation.h
2012-07-26 18:05:42 UTC (rev 49264)
@@ -61,7 +61,7 @@
void setAxis(int value) {this->axis = value;}
void setRelative(bool value) {this->relative = value;}
- void executePixel(float *color, float x, float y, PixelSampler sampler,
MemoryBuffer * inputBuffers[]);
+ void executePixel(float *color, float x, float y, PixelSampler sampler);
const bool isSetOperation() const { return true; }
};
Property changes on:
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49260
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49263
Modified:
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
2012-07-26 18:05:05 UTC (rev 49263)
+++ branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
2012-07-26 18:05:42 UTC (rev 49264)
@@ -915,12 +915,13 @@
if (prop) {
PointerRNA oldptr;
+ Image *oldima;
oldptr = RNA_property_pointer_get(&ptr, prop);
- ima = (Image *)oldptr.id.data;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
