Revision: 49262
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49262
Author: campbellbarton
Date: 2012-07-26 17:41:09 +0000 (Thu, 26 Jul 2012)
Log Message:
-----------
fix some types and incorrect info
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
trunk/blender/intern/ghost/intern/GHOST_Window.h
trunk/blender/intern/itasc/kdl/utilities/utility_io.cpp
trunk/blender/intern/memutil/MEM_RefCountPtr.h
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/blenlib/intern/freetypefont.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/makesdna/DNA_ID.h
trunk/blender/source/blender/makesrna/intern/rna_rna.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
trunk/blender/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_FramingManager.h
trunk/blender/source/tools/spell_check_source.py
trunk/blender/source/tools/spell_check_source_config.py
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2012-07-26
17:15:28 UTC (rev 49261)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2012-07-26
17:41:09 UTC (rev 49262)
@@ -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: trunk/blender/intern/ghost/intern/GHOST_Window.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_Window.h 2012-07-26 17:15:28 UTC
(rev 49261)
+++ trunk/blender/intern/ghost/intern/GHOST_Window.h 2012-07-26 17:41:09 UTC
(rev 49262)
@@ -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: trunk/blender/intern/itasc/kdl/utilities/utility_io.cpp
===================================================================
--- trunk/blender/intern/itasc/kdl/utilities/utility_io.cpp 2012-07-26
17:15:28 UTC (rev 49261)
+++ trunk/blender/intern/itasc/kdl/utilities/utility_io.cpp 2012-07-26
17:41:09 UTC (rev 49262)
@@ -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: trunk/blender/intern/memutil/MEM_RefCountPtr.h
===================================================================
--- trunk/blender/intern/memutil/MEM_RefCountPtr.h 2012-07-26 17:15:28 UTC
(rev 49261)
+++ trunk/blender/intern/memutil/MEM_RefCountPtr.h 2012-07-26 17:41:09 UTC
(rev 49262)
@@ -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: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c 2012-07-26
17:15:28 UTC (rev 49261)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c 2012-07-26
17:41:09 UTC (rev 49262)
@@ -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: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-07-26
17:15:28 UTC (rev 49261)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-07-26
17:41:09 UTC (rev 49262)
@@ -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: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c 2012-07-26
17:15:28 UTC (rev 49261)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c 2012-07-26
17:41:09 UTC (rev 49262)
@@ -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: trunk/blender/source/blender/blenlib/intern/freetypefont.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/freetypefont.c 2012-07-26
17:15:28 UTC (rev 49261)
+++ trunk/blender/source/blender/blenlib/intern/freetypefont.c 2012-07-26
17:41:09 UTC (rev 49262)
@@ -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: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c
2012-07-26 17:15:28 UTC (rev 49261)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c
2012-07-26 17:41:09 UTC (rev 49262)
@@ -914,12 +914,13 @@
if (prop) {
PointerRNA oldptr;
+ Image *oldima;
oldptr = RNA_property_pointer_get(&ptr, prop);
- ima = (Image *)oldptr.id.data;
- /* unlikely but better avoid strange crash */
- if (ima && GS(ima->id.name) != ID_IM) {
- ima = NULL;
+ oldima = (Image *)oldptr.id.data;
+ /* unlikely to fail but better avoid strange crash */
+ if (oldima && GS(oldima->id.name) != ID_IM) {
+ ima = oldima;
}
}
}
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c
2012-07-26 17:15:28 UTC (rev 49261)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c
2012-07-26 17:41:09 UTC (rev 49262)
@@ -438,7 +438,7 @@
/* rotation */
/* [#22409] is partially caused by
this, as slight numeric error introduced during
* the solving process leads to
locked-axis values changing. However, we cannot modify
- * the values here, or else there are
huge discreptancies between IK-solver (interactive)
+ * the values here, or else there are
huge discrepancies between IK-solver (interactive)
* and applied poses.
*/
if (parchan->rotmode > 0)
Modified: trunk/blender/source/blender/makesdna/DNA_ID.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_ID.h 2012-07-26 17:15:28 UTC
(rev 49261)
+++ trunk/blender/source/blender/makesdna/DNA_ID.h 2012-07-26 17:41:09 UTC
(rev 49262)
@@ -86,7 +86,7 @@
#define IDP_STRING_SUB_UTF8 0 /* default */
#define IDP_STRING_SUB_BYTE 1 /* arbitrary byte array, _not_ null terminated
*/
/*->flag*/
-#define IDP_FLAG_GHOST (1<<7) /* this means the propery is set but RNA will
return
+#define IDP_FLAG_GHOST (1<<7) /* this means the property is set but RNA will
return
* false when checking 'RNA_property_is_set',
* currently this is a runtime flag */
Modified: trunk/blender/source/blender/makesrna/intern/rna_rna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_rna.c 2012-07-26
17:15:28 UTC (rev 49261)
+++ trunk/blender/source/blender/makesrna/intern/rna_rna.c 2012-07-26
17:41:09 UTC (rev 49262)
@@ -526,7 +526,7 @@
{
PropertyRNA *prop = (PropertyRNA *)ptr->data;
- /* don't use this becaure it will call functions that check the internal
+ /* don't use this because it will call functions that check the internal
* data for introspection we only need to know if it can be edited so
the
* flag is better for this */
/* return RNA_property_editable(ptr, prop); */
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2012-07-26
17:15:28 UTC (rev 49261)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2012-07-26
17:41:09 UTC (rev 49262)
@@ -145,7 +145,7 @@
};
-/* workaround for duplice enums,
+/* workaround for duplicate enums,
* have each enum line as a defne then conditionally set it or not
*/
@@ -771,7 +771,7 @@
#ifdef WITH_FFMPEG
/* a WAY more crappy case than B&W flag: depending on codec, file
format MIGHT support
* alpha channel. for example MPEG format with h264 codec can't do
alpha channel, but
- * the same MPEG format with QTRLE codec can easily handle alpga
channel.
+ * the same MPEG format with QTRLE codec can easily handle alpha
channel.
* not sure how to deal with such cases in a nicer way (sergey) */
if (is_render) {
Scene *scene = ptr->id.data;
@@ -1105,7 +1105,7 @@
if (ntree && scene->use_nodes) {
/* images are freed here, stop render and preview threads, until
- * Image is threadsafe. when we are changing this propery from a
+ * Image is threadsafe. when we are changing this property from
a
* python script in the render thread, don't stop own thread */
if (BLI_thread_is_main())
WM_jobs_stop_all(bmain->wm.first);
Modified: trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_boolean.c 2012-07-26
17:15:28 UTC (rev 49261)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
