[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43477] branches/bmesh/blender: svn merge ^/trunk/blender -r43461:43472

Campbell Barton ideasman42 at gmail.com
Tue Jan 17 22:08:35 CET 2012


Revision: 43477
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43477
Author:   campbellbarton
Date:     2012-01-17 21:08:25 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43461:43472

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

Modified Paths:
--------------
    branches/bmesh/blender/extern/carve/include/carve/polyline_iter.hpp
    branches/bmesh/blender/intern/cycles/blender/addon/enums.py
    branches/bmesh/blender/intern/cycles/blender/addon/ui.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/keyconfig_utils.py
    branches/bmesh/blender/release/scripts/modules/rna_xml.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_image.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_time.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_text.h
    branches/bmesh/blender/source/blender/blenkernel/intern/paint.c
    branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
    branches/bmesh/blender/source/blender/blenkernel/intern/text.c
    branches/bmesh/blender/source/blender/blenlib/BLI_math_vector.h
    branches/bmesh/blender/source/blender/blenlib/intern/math_vector_inline.c
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
    branches/bmesh/blender/source/blender/editors/include/ED_image.h
    branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
    branches/bmesh/blender/source/blender/editors/include/ED_uvedit.h
    branches/bmesh/blender/source/blender/editors/include/ED_view3d.h
    branches/bmesh/blender/source/blender/editors/include/UI_resources.h
    branches/bmesh/blender/source/blender/editors/interface/resources.c
    branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
    branches/bmesh/blender/source/blender/editors/object/object_edit.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/bmesh/blender/source/blender/editors/sculpt_paint/SConscript
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_intern.h
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_ops.c
    branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
    branches/bmesh/blender/source/blender/editors/space_image/space_image.c
    branches/bmesh/blender/source/blender/editors/uvedit/CMakeLists.txt
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_draw.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_intern.h
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c
    branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
    branches/bmesh/blender/source/blender/makesrna/RNA_access.h
    branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_keymap.c
    branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/bmesh/blender/source/tests/bl_mesh_modifiers.py

Added Paths:
-----------
    branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/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
/trunk/blender:39992-43461
   + /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/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
/trunk/blender:39992-43472

Modified: branches/bmesh/blender/extern/carve/include/carve/polyline_iter.hpp
===================================================================
--- branches/bmesh/blender/extern/carve/include/carve/polyline_iter.hpp	2012-01-17 19:04:31 UTC (rev 43476)
+++ branches/bmesh/blender/extern/carve/include/carve/polyline_iter.hpp	2012-01-17 21:08:25 UTC (rev 43477)
@@ -20,6 +20,7 @@
 #include <list>
 #include <iterator>
 #include <limits>
+#include <cstddef>
 
 #include <carve/polyline_decl.hpp>
 

Modified: branches/bmesh/blender/intern/cycles/blender/addon/enums.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/enums.py	2012-01-17 19:04:31 UTC (rev 43476)
+++ branches/bmesh/blender/intern/cycles/blender/addon/enums.py	2012-01-17 21:08:25 UTC (rev 43477)
@@ -21,8 +21,8 @@
 from . import engine
 
 devices = (
-	("CPU", "CPU", "Use CPU for rendering"),
-	("GPU", "GPU Compute", "Use GPU compute device for rendering, configured in user preferences"))
+    ("CPU", "CPU", "Use CPU for rendering"),
+    ("GPU", "GPU Compute", "Use GPU compute device for rendering, configured in user preferences"))
 
 feature_set = (
     ("SUPPORTED", "Supported", "Only use finished and supported features"),

Modified: branches/bmesh/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/ui.py	2012-01-17 19:04:31 UTC (rev 43476)
+++ branches/bmesh/blender/intern/cycles/blender/addon/ui.py	2012-01-17 21:08:25 UTC (rev 43477)
@@ -149,6 +149,7 @@
         sub.prop(cscene, "debug_use_spatial_splits")
         sub.prop(cscene, "use_cache")
 
+
 class CyclesRender_PT_layers(CyclesButtonsPanel, Panel):
     bl_label = "Layers"
     bl_options = {'DEFAULT_CLOSED'}
@@ -708,7 +709,7 @@
     scene = context.scene
     layout = self.layout
 
-    if scene.render.engine == "CYCLES":
+    if scene.render.engine == 'CYCLES':
         cscene = scene.cycles
 
         layout.prop(cscene, "feature_set")
@@ -719,6 +720,7 @@
         elif device_type == 'OPENCL' and cscene.feature_set == 'EXPERIMENTAL':
             layout.prop(cscene, "device")
 
+
 def draw_pause(self, context):
     layout = self.layout
     scene = context.scene
@@ -726,7 +728,7 @@
     if scene.render.engine == "CYCLES":
         view = context.space_data
 
-        if view.viewport_shade == "RENDERED":
+        if view.viewport_shade == 'RENDERED':
             cscene = scene.cycles
             layout.prop(cscene, "preview_pause", icon="PAUSE", text="")
 


Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435
   + /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43472

Modified: branches/bmesh/blender/release/scripts/modules/bpy_extras/keyconfig_utils.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/bpy_extras/keyconfig_utils.py	2012-01-17 19:04:31 UTC (rev 43476)
+++ branches/bmesh/blender/release/scripts/modules/bpy_extras/keyconfig_utils.py	2012-01-17 21:08:25 UTC (rev 43477)
@@ -70,6 +70,7 @@
     ('Image', 'IMAGE_EDITOR', 'WINDOW', [
         ('UV Editor', 'EMPTY', 'WINDOW', []),  # image (reverse order, UVEdit before Image
         ('Image Paint', 'EMPTY', 'WINDOW', []),  # image and view3d
+        ('UV Sculpt', 'EMPTY', 'WINDOW', []),
         ('Image Generic', 'IMAGE_EDITOR', 'WINDOW', [])
         ]),
 

Modified: branches/bmesh/blender/release/scripts/modules/rna_xml.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/rna_xml.py	2012-01-17 19:04:31 UTC (rev 43476)
+++ branches/bmesh/blender/release/scripts/modules/rna_xml.py	2012-01-17 21:08:25 UTC (rev 43477)
@@ -141,7 +141,7 @@
                                     return number_to_str(s, subsubvalue_type)
                                 else:
                                     return " ".join([str_recursive(si) for si in s])
-                            
+
                             array_value = " ".join(str_recursive(v) for v in subvalue_rna)
 
                         node_attrs.append("%s=\"%s\"" % (prop, array_value))
@@ -308,13 +308,13 @@
     rna2xml_node(root_xml, root_rna)
 
 
-
 # -----------------------------------------------------------------------------
 # Utility function used by presets.
 # The idea is you can run a preset like a script with a few args.
 #
 # This roughly matches the operator 'bpy.ops.script.python_file_run'
 
+
 def _get_context_val(context, path):
     path_full = "context." + path
     try:
@@ -328,6 +328,7 @@
 
     return value
 
+
 def xml_file_run(context, filepath, rna_map):
 
     import xml.dom.minidom

Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py	2012-01-17 19:04:31 UTC (rev 43476)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py	2012-01-17 21:08:25 UTC (rev 43477)
@@ -76,6 +76,7 @@
 
     return camera
 
+
 def CLIP_track_view_selected(sc, track):
     if track.select_anchor:
         return True
@@ -118,7 +119,7 @@
         constraint.track = track.name
         constraint.use_3d_position = False
         constraint.object = tracking_object.name
-        constraint.camera = CLIP_camera_for_clip(context, clip);
+        constraint.camera = CLIP_camera_for_clip(context, clip)
 
     def execute(self, context):
         sc = context.space_data
@@ -127,7 +128,7 @@
 
         for track in tracking_object.tracks:
             if CLIP_track_view_selected(sc, track):
-                self._link_track(context, clip, tracking_object ,track)
+                self._link_track(context, clip, tracking_object, track)
 
         return {'FINISHED'}
 

Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py	2012-01-17 19:04:31 UTC (rev 43476)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py	2012-01-17 21:08:25 UTC (rev 43477)
@@ -166,9 +166,10 @@
         if attr is None:
             return {'CANCELLED'}
 
+        toolsettings = context.tool_settings
         for i, brush in enumerate((cur for cur in bpy.data.brushes if getattr(cur, attr))):
             if i == self.index:
-                getattr(context.tool_settings, self.mode).brush = brush
+                getattr(toolsettings, self.mode).brush = brush
                 return {'FINISHED'}
 
         return {'CANCELLED'}
@@ -1768,4 +1769,3 @@
         info = addon_utils.module_bl_info(mod)
         info["show_expanded"] = not info["show_expanded"]
         return {'FINISHED'}
-

Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py	2012-01-17 19:04:31 UTC (rev 43476)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py	2012-01-17 21:08:25 UTC (rev 43477)
@@ -287,7 +287,7 @@
         col = row.column()
         col.prop(gs, "use_desktop")
         col.active = gs.show_fullscreen
-        
+
         col = layout.column()
         col.label(text="Quality:")
         col.prop(gs, "samples")

Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py	2012-01-17 19:04:31 UTC (rev 43476)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py	2012-01-17 21:08:25 UTC (rev 43477)
@@ -418,9 +418,9 @@
         rd = context.scene.render
 
         layout.active = rd.use_stamp
-        
+
         layout.prop(rd, "stamp_font_size", text="Font Size")
-        
+
         row = layout.row()
         row.column().prop(rd, "stamp_foreground", slider=True)
         row.column().prop(rd, "stamp_background", slider=True)
@@ -433,7 +433,7 @@
         col.prop(rd, "use_stamp_render_time", text="RenderTime")
         col.prop(rd, "use_stamp_frame", text="Frame")
         col.prop(rd, "use_stamp_scene", text="Scene")
-        
+
         col = split.column()
         col.prop(rd, "use_stamp_camera", text="Camera")
         col.prop(rd, "use_stamp_lens", text="Lens")

Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py	2012-01-17 19:04:31 UTC (rev 43476)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py	2012-01-17 21:08:25 UTC (rev 43477)
@@ -162,22 +162,25 @@
 
     def draw(self, context):
         layout = self.layout
-        # clip = context.space_data.clip  # UNUSED
 
         row = layout.row(align=True)
 
-        row.operator("clip.track_markers", text="", icon='FRAME_PREV').backwards = True
+        props = row.operator("clip.track_markers", text="", icon='FRAME_PREV')
+        props.backwards = True

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list