[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40482] branches/bmesh/blender: svn merge ^/trunk/blender -r40382:r40389

[Campbell Barton]

Revision: 40482
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40482
Author:   campbellbarton
Date:     2011-09-23 06:43:06 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r40382:r40389

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40382
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40389

Modified Paths:
--------------
    branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
    branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
    branches/bmesh/blender/source/blender/editors/transform/transform_ops.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/
    branches/bmesh/blender/source/blender/editors/space_outliner/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:39992-40382
   + /trunk/blender:39992-40389

Modified: branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/win64-vc-config.py	2011-09-23 06:35:49 UTC (rev 40481)
+++ branches/bmesh/blender/build_files/scons/config/win64-vc-config.py	2011-09-23 06:43:06 UTC (rev 40482)
@@ -188,11 +188,6 @@
 
 LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
 
-if BF_DEBUG:
-	BF_NUMJOBS=1
-else:
-	BF_NUMJOBS=6
-
 PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib']
 
 BF_BUILDDIR = '..\\build\\blender25-win64-vc'


Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release:31524-40382
   + /trunk/blender/release:31524-40389


Property changes on: branches/bmesh/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-40382
   + /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-40389

Modified: branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c	2011-09-23 06:35:49 UTC (rev 40481)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c	2011-09-23 06:43:06 UTC (rev 40482)
@@ -2786,7 +2786,7 @@
 	ot->flag= 0;
 
 	RNA_def_enum(ot->srna, "type", prop_view_items, 0, "View", "The Type of view");
-	RNA_def_boolean(ot->srna, "align_active", 0, "Align Active", "Align to the active objects axis");
+	RNA_def_boolean(ot->srna, "align_active", 0, "Align Active", "Align to the active object's axis");
 }
 
 static EnumPropertyItem prop_view_orbit_items[] = {

Modified: branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c	2011-09-23 06:35:49 UTC (rev 40481)
+++ branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c	2011-09-23 06:43:06 UTC (rev 40482)
@@ -2071,7 +2071,7 @@
 	float *dists=NULL;
 	int count=0, countsel=0, a, totleft, *selstate = NULL;
 	BLI_array_declare(selstate);
-	int propmode = t->flag & (T_PROP_EDIT|T_PROP_CONNECTED);
+	int propmode = (t->flag & T_PROP_EDIT) ? (t->flag & (T_PROP_EDIT | T_PROP_CONNECTED)) : 0;
 	int mirror = 0;
 	short selectmode = ts->selectmode;
 

Modified: branches/bmesh/blender/source/blender/editors/transform/transform_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/transform/transform_ops.c	2011-09-23 06:35:49 UTC (rev 40481)
+++ branches/bmesh/blender/source/blender/editors/transform/transform_ops.c	2011-09-23 06:43:06 UTC (rev 40482)
@@ -795,7 +795,7 @@
 	ot->cancel  = transform_cancel;
 	ot->poll   = ED_operator_sequencer_active;
 
-	RNA_def_float_vector(ot->srna, "value", 2, VecOne, -FLT_MAX, FLT_MAX, "angle", "", -FLT_MAX, FLT_MAX);
+	RNA_def_float_vector(ot->srna, "value", 2, VecOne, -FLT_MAX, FLT_MAX, "Angle", "", -FLT_MAX, FLT_MAX);
 
 	Transform_Properties(ot, P_SNAP);
 }

Modified: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c	2011-09-23 06:35:49 UTC (rev 40481)
+++ branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c	2011-09-23 06:43:06 UTC (rev 40482)
@@ -2755,7 +2755,7 @@
 	ot->poll= ED_operator_image_active;	/* requires space image */;
 
 	/* properties */
-	RNA_def_enum(ot->srna, "target", target_items, 0, "Target", "Target to snap the selected UV's to");
+	RNA_def_enum(ot->srna, "target", target_items, 0, "Target", "Target to snap the selected UVs to");
 }
 
 /* ******************** snap selection operator **************** */
@@ -2964,7 +2964,7 @@
 	ot->poll= ED_operator_image_active;	/* requires space image */;
 
 	/* properties */
-	RNA_def_enum(ot->srna, "target", target_items, 0, "Target", "Target to snap the selected UV's to");
+	RNA_def_enum(ot->srna, "target", target_items, 0, "Target", "Target to snap the selected UVs to");
 }
 
 /* ******************** pin operator **************** */