[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50009] branches/soc-2012-bratwurst: svn merge ^/trunk/blender -r49900:49963

Campbell Barton ideasman42 at gmail.com
Sun Aug 19 13:04:01 CEST 2012


Revision: 50009
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50009
Author:   campbellbarton
Date:     2012-08-19 11:04:01 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49900:49963

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

Modified Paths:
--------------
    branches/soc-2012-bratwurst/CMakeLists.txt
    branches/soc-2012-bratwurst/GNUmakefile
    branches/soc-2012-bratwurst/release/scripts/modules/bpy/path.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/node.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_animviz.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_mask_common.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/armature.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/boids.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/customdata.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/editderivedmesh.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/font.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/gpencil.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/idprop.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mesh.c
    branches/soc-2012-bratwurst/source/blender/blenloader/intern/writefile.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_mods.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2012-bratwurst/source/blender/collada/EffectExporter.cpp
    branches/soc-2012-bratwurst/source/blender/collada/GeometryExporter.cpp
    branches/soc-2012-bratwurst/source/blender/collada/ImageExporter.cpp
    branches/soc-2012-bratwurst/source/blender/collada/InstanceWriter.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_MemoryBuffer.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_MemoryBuffer.h
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_SocketReader.h
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BokehImageOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DisplaceOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_InpaintOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MapUVOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieDistortionOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ReadBufferOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2012-bratwurst/source/blender/editors/armature/editarmature.c
    branches/soc-2012-bratwurst/source/blender/editors/include/ED_image.h
    branches/soc-2012-bratwurst/source/blender/editors/include/ED_node.h
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface_intern.h
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface_regions.c
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface_templates.c
    branches/soc-2012-bratwurst/source/blender/editors/object/object_bake.c
    branches/soc-2012-bratwurst/source/blender/editors/object/object_modifier.c
    branches/soc-2012-bratwurst/source/blender/editors/object/object_vgroup.c
    branches/soc-2012-bratwurst/source/blender/editors/physics/physics_fluid.c
    branches/soc-2012-bratwurst/source/blender/editors/render/render_internal.c
    branches/soc-2012-bratwurst/source/blender/editors/render/render_opengl.c
    branches/soc-2012-bratwurst/source/blender/editors/render/render_preview.c
    branches/soc-2012-bratwurst/source/blender/editors/screen/area.c
    branches/soc-2012-bratwurst/source/blender/editors/screen/screendump.c
    branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/space_file/filelist.c
    branches/soc-2012-bratwurst/source/blender/editors/space_image/image_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/space_node/node_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/space_node/node_view.c
    branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2012-bratwurst/source/blender/editors/util/undo.c
    branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2012-bratwurst/source/blender/render/intern/source/shadbuf.c
    branches/soc-2012-bratwurst/source/blender/windowmanager/WM_api.h
    branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2012-bratwurst/source/blender/windowmanager/wm_event_types.h

Property Changed:
----------------
    branches/soc-2012-bratwurst/
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
    branches/soc-2012-bratwurst/source/blender/editors/space_outliner/


Property changes on: branches/soc-2012-bratwurst
___________________________________________________________________
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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:46808-49900
   + /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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:46808-49963

Modified: branches/soc-2012-bratwurst/CMakeLists.txt
===================================================================
--- branches/soc-2012-bratwurst/CMakeLists.txt	2012-08-19 11:01:31 UTC (rev 50008)
+++ branches/soc-2012-bratwurst/CMakeLists.txt	2012-08-19 11:04:01 UTC (rev 50009)
@@ -996,7 +996,7 @@
 			set(BOOST ${LIBDIR}/boost)
 			set(BOOST_INCLUDE_DIR ${BOOST}/include)
 			if(MSVC10)
-				set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
+				set(BOOST_LIBPATH ${BOOST}/vc2010/lib)
 				set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
 				set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
 			else()

Modified: branches/soc-2012-bratwurst/GNUmakefile
===================================================================
--- branches/soc-2012-bratwurst/GNUmakefile	2012-08-19 11:01:31 UTC (rev 50008)
+++ branches/soc-2012-bratwurst/GNUmakefile	2012-08-19 11:04:01 UTC (rev 50009)
@@ -19,9 +19,9 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
-# This Makefile does an out-of-source CMake build in ../build/`OS`_`CPU`
+# This Makefile does an out-of-source CMake build in ../build_`OS`_`CPU`
 # eg:
-#   ../build/Linux_i386
+#   ../build_linux_i386
 # This is for users who like to configure & build blender with a single command.
 
 
@@ -40,7 +40,7 @@
 endif
 
 ifndef BUILD_DIR
-	BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
+	BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build_$(OS_NCASE)
 endif
 
 

Modified: branches/soc-2012-bratwurst/release/scripts/modules/bpy/path.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/modules/bpy/path.py	2012-08-19 11:01:31 UTC (rev 50008)
+++ branches/soc-2012-bratwurst/release/scripts/modules/bpy/path.py	2012-08-19 11:04:01 UTC (rev 50009)
@@ -256,7 +256,7 @@
         elif filename.endswith(".py") and filename != "__init__.py":
             fullpath = join(path, filename)
             modules.append((filename[0:-3], fullpath))
-        elif ("." not in filename):
+        elif "." not in filename:
             directory = join(path, filename)
             fullpath = join(directory, "__init__.py")
             if isfile(fullpath):

Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/node.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/node.py	2012-08-19 11:01:31 UTC (rev 50008)
+++ branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/node.py	2012-08-19 11:04:01 UTC (rev 50009)
@@ -57,10 +57,10 @@
 def node_type_items_cb(self, context):
     snode = context.space_data
     if not snode:
-        return []
+        return ()
     tree = snode.edit_tree
     if not tree:
-        return []
+        return ()
 
     # Lists of basic node types for each
     if not node_type_items_dict:
@@ -76,7 +76,7 @@
     if tree.type in node_type_items_dict:
         return node_type_items_dict[tree.type] + node_group_items(tree.type)
     else:
-        return []
+        return ()
 
 
 class NODE_OT_add_search(Operator):
@@ -100,10 +100,10 @@
 
         # Enum item identifier has an additional prefix to distinguish base node types from node groups
         item = self.type
-        if (item.startswith(node_type_prefix)):
+        if item.startswith(node_type_prefix):
             # item means base node type
             node = tree.nodes.new(type=item[len(node_type_prefix):])
-        elif (item.startswith(node_group_prefix)):
+        elif item.startswith(node_group_prefix):
             # item means node group type
             node = tree.nodes.new(type='GROUP', group=bpy.data.node_groups[item[len(node_group_prefix):]])
         else:

Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_animviz.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_animviz.py	2012-08-19 11:01:31 UTC (rev 50008)
+++ branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_animviz.py	2012-08-19 11:04:01 UTC (rev 50009)
@@ -44,10 +44,10 @@
         col = split.column()
         col.label(text="Display Range:")
         sub = col.column(align=True)
-        if (mps.type == 'CURRENT_FRAME'):
+        if mps.type == 'CURRENT_FRAME':
             sub.prop(mps, "frame_before", text="Before")
             sub.prop(mps, "frame_after", text="After")
-        elif (mps.type == 'RANGE'):
+        elif mps.type == 'RANGE':
             sub.prop(mps, "frame_start", text="Start")
             sub.prop(mps, "frame_end", text="End")
 

Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_data_curve.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_data_curve.py	2012-08-19 11:01:31 UTC (rev 50008)
+++ branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_data_curve.py	2012-08-19 11:04:01 UTC (rev 50009)
@@ -106,7 +106,7 @@
             sub.prop(curve, "resolution_v", text="Preview V")
             sub.prop(curve, "render_resolution_v", text="Render V")
 
-        if (is_curve or is_text):
+        if is_curve or is_text:
             col.label(text="Fill:")
             sub = col.column()
             sub.active = (curve.dimensions == '2D' or (curve.bevel_object is None and curve.dimensions == '3D'))

Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_data_lamp.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_data_lamp.py	2012-08-19 11:01:31 UTC (rev 50008)
+++ branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_data_lamp.py	2012-08-19 11:04:01 UTC (rev 50009)
@@ -322,9 +322,9 @@
         col.row().prop(lamp, "shape", expand=True)
         sub = col.row(align=True)
 
-        if (lamp.shape == 'SQUARE'):
+        if lamp.shape == 'SQUARE':
             sub.prop(lamp, "size")
-        elif (lamp.shape == 'RECTANGLE'):
+        elif lamp.shape == 'RECTANGLE':
             sub.prop(lamp, "size", text="Size X")
             sub.prop(lamp, "size_y", text="Size Y")
 

Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_mask_common.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_mask_common.py	2012-08-19 11:01:31 UTC (rev 50008)
+++ branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_mask_common.py	2012-08-19 11:04:01 UTC (rev 50009)
@@ -223,7 +223,7 @@
         col.operator("transform.translate")
         col.operator("transform.rotate")
         col.operator("transform.resize", text="Scale")
-        props = col.operator("transform.transform", text="Shrink/Fatten")
+        props = col.operator("transform.transform", text="Scale Feather")
         props.mode = 'MASK_SHRINKFATTEN'
 
         col = layout.column(align=True)
@@ -291,7 +291,7 @@
         layout.operator("transform.translate")
         layout.operator("transform.rotate")
         layout.operator("transform.resize")
-        props = layout.operator("transform.transform", text="Shrink/Fatten")
+        props = layout.operator("transform.transform", text="Scale Feather")
         props.mode = 'MASK_SHRINKFATTEN'
 
 

Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_particle.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_particle.py	2012-08-19 11:01:31 UTC (rev 50008)
+++ branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_particle.py	2012-08-19 11:04:01 UTC (rev 50009)
@@ -1008,7 +1008,7 @@
         sub.active = (part.draw_color in {'VELOCITY', 'ACCELERATION'})
         sub.prop(part, "color_maximum", text="Max")
 
-        if (path):
+        if path:
             col.prop(part, "draw_step")
 
 

Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_physics_field.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_physics_field.py	2012-08-19 11:01:31 UTC (rev 50008)
+++ branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_physics_field.py	2012-08-19 11:04:01 UTC (rev 50009)
@@ -92,7 +92,7 @@
             layout.separator()
 
             layout.prop(field, "guide_kink_type")
-            if (field.guide_kink_type != 'NONE'):
+            if field.guide_kink_type != 'NONE':
                 layout.prop(field, "guide_kink_axis")
 
                 split = layout.split()

Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list