[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37003] branches/soc-2011-onion: Merged with trunk: 36974-36981
Jason Wilkins
Jason.A.Wilkins at gmail.com
Sun May 29 17:18:27 CEST 2011
Revision: 37003
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37003
Author: jwilkins
Date: 2011-05-29 15:18:26 +0000 (Sun, 29 May 2011)
Log Message:
-----------
Merged with trunk: 36974-36981
I really should learn to use "svn merge ^" command aince I somehow missed these 8 revisions
Modified Paths:
--------------
branches/soc-2011-onion/CMakeLists.txt
branches/soc-2011-onion/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
branches/soc-2011-onion/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
branches/soc-2011-onion/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-onion/source/blender/blenkernel/intern/brush.c
branches/soc-2011-onion/source/blender/blenkernel/intern/curve.c
branches/soc-2011-onion/source/blender/blenkernel/intern/image.c
branches/soc-2011-onion/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-onion/source/blender/blenkernel/intern/object.c
branches/soc-2011-onion/source/blender/blenkernel/intern/text.c
branches/soc-2011-onion/source/blender/blenlib/intern/path_util.c
branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c
branches/soc-2011-onion/source/blender/editors/interface/interface.c
branches/soc-2011-onion/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-onion/source/blender/editors/physics/particle_edit.c
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-onion/source/blender/editors/space_node/drawnode.c
branches/soc-2011-onion/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-onion/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-onion/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-onion/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-onion/source/blender/editors/util/undo.c
branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-onion/source/blender/imbuf/intern/imageprocess.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-onion/source/blender/python/generic/IDProp.c
branches/soc-2011-onion/source/blender/python/generic/bpy_internal_import.h
branches/soc-2011-onion/source/blender/python/intern/bpy_rna.c
branches/soc-2011-onion/source/blender/python/intern/bpy_rna.h
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-onion/source/creator/creator.c
branches/soc-2011-onion/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2011-onion/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
Property Changed:
----------------
branches/soc-2011-onion/
Property changes on: branches/soc-2011-onion
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36833-36973,36982-37001
+ /trunk/blender:36833-37002
Modified: branches/soc-2011-onion/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/CMakeLists.txt 2011-05-29 14:38:15 UTC (rev 37002)
+++ branches/soc-2011-onion/CMakeLists.txt 2011-05-29 15:18:26 UTC (rev 37003)
@@ -88,7 +88,7 @@
option(WITH_PYTHON "Enable Embedded Python API (only disable for development)" ON)
option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF)
mark_as_advanced(WITH_PYTHON) # dont want people disabling this unless they really know what they are doing.
-mark_as_advanced(WITH_PYTHON_SECURITY) # some distrobutions see this as a security issue, rather then have them patch it, make a build option.
+mark_as_advanced(WITH_PYTHON_SECURITY) # some distrobutions see this as a security issue, rather than have them patch it, make a build option.
option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
option(WITH_PYTHON_MODULE "Enable building as a python module (experemental, only enable for development)" OFF)
Modified: branches/soc-2011-onion/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
===================================================================
--- branches/soc-2011-onion/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h 2011-05-29 14:38:15 UTC (rev 37002)
+++ branches/soc-2011-onion/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h 2011-05-29 15:18:26 UTC (rev 37003)
@@ -1026,7 +1026,7 @@
/// The btAxisSweep3 is an efficient implementation of the 3d axis sweep and prune broadphase.
-/// It uses arrays rather then lists for storage of the 3 axis. Also it operates using 16 bit integer coordinates instead of floats.
+/// It uses arrays rather than lists for storage of the 3 axis. Also it operates using 16 bit integer coordinates instead of floats.
/// For large worlds and many objects, use bt32BitAxisSweep3 or btDbvtBroadphase instead. bt32BitAxisSweep3 has higher precision and allows more then 16384 objects at the cost of more memory and bit of performance.
class btAxisSweep3 : public btAxisSweep3Internal<unsigned short int>
{
@@ -1038,7 +1038,7 @@
/// The bt32BitAxisSweep3 allows higher precision quantization and more objects compared to the btAxisSweep3 sweep and prune.
/// This comes at the cost of more memory per handle, and a bit slower performance.
-/// It uses arrays rather then lists for storage of the 3 axis.
+/// It uses arrays rather than lists for storage of the 3 axis.
class bt32BitAxisSweep3 : public btAxisSweep3Internal<unsigned int>
{
public:
Modified: branches/soc-2011-onion/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
===================================================================
--- branches/soc-2011-onion/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp 2011-05-29 14:38:15 UTC (rev 37002)
+++ branches/soc-2011-onion/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp 2011-05-29 15:18:26 UTC (rev 37003)
@@ -487,7 +487,7 @@
{
(void)resultOut;
(void)dispatchInfo;
- ///Rather then checking ALL pairs, only calculate TOI when motion exceeds threshold
+ ///rather than checking ALL pairs, only calculate TOI when motion exceeds threshold
///Linear motion for one of objects needs to exceed m_ccdSquareMotionThreshold
///col0->m_worldTransform,
Modified: branches/soc-2011-onion/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/BKE_blender.h 2011-05-29 14:38:15 UTC (rev 37002)
+++ branches/soc-2011-onion/source/blender/blenkernel/BKE_blender.h 2011-05-29 15:18:26 UTC (rev 37003)
@@ -42,7 +42,7 @@
/* these lines are grep'd, watch out for our not-so-awesome regex
* and keep comment above the defines.
- * Use STRINGIFY() rather then defining with quotes */
+ * Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 257
#define BLENDER_SUBVERSION 1
Modified: branches/soc-2011-onion/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/intern/brush.c 2011-05-29 14:38:15 UTC (rev 37002)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/brush.c 2011-05-29 15:18:26 UTC (rev 37003)
@@ -1251,6 +1251,19 @@
return 0;
}
+// XXX: be careful about setting size and unprojected radius
+// because they depend on one another
+// these functions do not set the other corresponding value
+// this can lead to odd behavior if size and unprojected
+// radius become inconsistent.
+// the biggest problem is that it isn't possible to change
+// unprojected radius because a view context is not
+// available. my ussual solution to this is to use the
+// ratio of change of the size to change the unprojected
+// radius. Not completely convinced that is correct.
+// In anycase, a better solution is needed to prevent
+// inconsistency.
+
static void set_unified_size(Brush *brush, int value)
{
Scene *sce;
Modified: branches/soc-2011-onion/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/intern/curve.c 2011-05-29 14:38:15 UTC (rev 37002)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/curve.c 2011-05-29 15:18:26 UTC (rev 37003)
@@ -1859,7 +1859,7 @@
* do this by calculating the tilt angle difference, then apply
* the rotation gradually over the entire curve
*
- * note that the split is between last and second last, rather then first/last as youd expect.
+ * note that the split is between last and second last, rather than first/last as youd expect.
*
* real order is like this
* 0,1,2,3,4 --> 1,2,3,4,0
Modified: branches/soc-2011-onion/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/intern/image.c 2011-05-29 14:38:15 UTC (rev 37002)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/image.c 2011-05-29 15:18:26 UTC (rev 37003)
@@ -1029,7 +1029,7 @@
BLF_buffer_col(mono, scene->r.fg_stamp[0], scene->r.fg_stamp[1], scene->r.fg_stamp[2], 1.0);
pad= BLF_width_max(mono);
- /* use 'h_fixed' rather then 'h', aligns better */
+ /* use 'h_fixed' rather than 'h', aligns better */
h_fixed= BLF_height_max(mono);
y_ofs = -BLF_descender(mono);
Modified: branches/soc-2011-onion/source/blender/blenkernel/intern/lattice.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/intern/lattice.c 2011-05-29 14:38:15 UTC (rev 37002)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/lattice.c 2011-05-29 15:18:26 UTC (rev 37003)
@@ -607,7 +607,7 @@
if(cd->no_rot_axis) { /* set by caller */
- /* this is not exactly the same as 2.4x, since the axis is having rotation removed rather then
+ /* this is not exactly the same as 2.4x, since the axis is having rotation removed rather than
* changing the axis before calculating the tilt but serves much the same purpose */
float dir_flat[3]={0,0,0}, q[4];
copy_v3_v3(dir_flat, dir);
Modified: branches/soc-2011-onion/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/intern/object.c 2011-05-29 14:38:15 UTC (rev 37002)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/object.c 2011-05-29 15:18:26 UTC (rev 37003)
@@ -1764,7 +1764,7 @@
mul_m4_m4m4(rmat, mat, imat); /* get the parent relative matrix */
object_apply_mat4(ob, rmat, use_compat, FALSE);
- /* same as below, use rmat rather then mat */
+ /* same as below, use rmat rather than mat */
mat4_to_loc_rot_size(ob->loc, rot, ob->size, rmat);
object_mat3_to_rot(ob, rot, use_compat);
}
Modified: branches/soc-2011-onion/source/blender/blenkernel/intern/text.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/intern/text.c 2011-05-29 14:38:15 UTC (rev 37002)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/text.c 2011-05-29 15:18:26 UTC (rev 37003)
@@ -2411,7 +2411,7 @@
return 1;
}
- /* insert spaces rather then tabs */
+ /* insert spaces rather than tabs */
if (add == '\t' && replace_tabs) {
txt_convert_tab_to_spaces(text);
return 1;
@@ -2509,7 +2509,7 @@
/* hardcoded: TXT_TABSIZE = 4 spaces: */
int spaceslen = TXT_TABSIZE;
- /* insert spaces rather then tabs */
+ /* insert spaces rather than tabs */
if (text->flags & TXT_TABSTOSPACES){
add = tab_to_spaces;
indentlen = spaceslen;
@@ -2570,7 +2570,7 @@
/* hardcoded: TXT_TABSIZE = 4 spaces: */
int spaceslen = TXT_TABSIZE;
- /* insert spaces rather then tabs */
+ /* insert spaces rather than tabs */
if (text->flags & TXT_TABSTOSPACES){
remove = tab_to_spaces;
indent = spaceslen;
Modified: branches/soc-2011-onion/source/blender/blenlib/intern/path_util.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenlib/intern/path_util.c 2011-05-29 14:38:15 UTC (rev 37002)
+++ branches/soc-2011-onion/source/blender/blenlib/intern/path_util.c 2011-05-29 15:18:26 UTC (rev 37003)
@@ -736,7 +736,7 @@
* cwd should contain c:\ etc on win32 so the relbase can be NULL
* relbase being NULL also prevents // being misunderstood as relative to the current
* blend file which isnt a feature we want to use in this case since were dealing
- * with a path from the command line, rather then from inside Blender */
+ * with a path from the command line, rather than from inside Blender */
char origpath[FILE_MAXDIR + FILE_MAXFILE];
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list