[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48106] branches/soc-2011-tomato: svn merge ^/trunk/blender -r48078:48105

Campbell Barton ideasman42 at gmail.com
Wed Jun 20 09:44:00 CEST 2012


Revision: 48106
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48106
Author:   campbellbarton
Date:     2012-06-20 07:43:49 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48078:48105

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

Modified Paths:
--------------
    branches/soc-2011-tomato/doc/python_api/examples/bpy.ops.2.py
    branches/soc-2011-tomato/doc/python_api/examples/bpy.ops.3.py
    branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
    branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
    branches/soc-2011-tomato/release/datafiles/clkernelstoh.py
    branches/soc-2011-tomato/release/scripts/modules/addon_utils.py
    branches/soc-2011-tomato/release/scripts/modules/animsys_refactor.py
    branches/soc-2011-tomato/release/scripts/modules/blend_render_info.py
    branches/soc-2011-tomato/release/scripts/modules/bpy/__init__.py
    branches/soc-2011-tomato/release/scripts/modules/bpy/ops.py
    branches/soc-2011-tomato/release/scripts/modules/bpy/utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/image_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpyml_ui.py
    branches/soc-2011-tomato/release/scripts/modules/console_shell.py
    branches/soc-2011-tomato/release/scripts/modules/graphviz_export.py
    branches/soc-2011-tomato/release/scripts/modules/rna_info.py
    branches/soc-2011-tomato/release/scripts/modules/rna_xml.py
    branches/soc-2011-tomato/release/scripts/modules/sys_info.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/anim.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/console.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_quick_effects.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DefocusNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
    branches/soc-2011-tomato/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_buttons.c
    branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2011-tomato/source/blender/editors/include/ED_clip.h
    branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_utils.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_add.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_edit.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_intern.h
    branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_dopesheet_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_dopesheet_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_utils.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_select.c
    branches/soc-2011-tomato/source/blender/editors/space_file/file_panels.c
    branches/soc-2011-tomato/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_logic/logic_window.c
    branches/soc-2011-tomato/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_header.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_templates.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-tomato/source/blender/editors/util/undo.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2011-tomato/source/tools/check_style_c.py

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-48078
   + /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-48105

Modified: branches/soc-2011-tomato/doc/python_api/examples/bpy.ops.2.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/examples/bpy.ops.2.py	2012-06-20 07:31:19 UTC (rev 48105)
+++ branches/soc-2011-tomato/doc/python_api/examples/bpy.ops.2.py	2012-06-20 07:43:49 UTC (rev 48106)
@@ -15,4 +15,3 @@
 import bpy
 override = {'selected_bases': list(bpy.context.scene.object_bases)}
 bpy.ops.object.delete(override)
-

Modified: branches/soc-2011-tomato/doc/python_api/examples/bpy.ops.3.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/examples/bpy.ops.3.py	2012-06-20 07:31:19 UTC (rev 48105)
+++ branches/soc-2011-tomato/doc/python_api/examples/bpy.ops.3.py	2012-06-20 07:43:49 UTC (rev 48106)
@@ -9,10 +9,9 @@
 
 for window in bpy.context.window_manager.windows:
     screen = window.screen
-    
+
     for area in screen.areas:
         if area.type == 'VIEW_3D':
             override = {'window': window, 'screen': screen, 'area': area}
             bpy.ops.screen.screen_full_area(override)
             break
-

Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py	2012-06-20 07:31:19 UTC (rev 48105)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py	2012-06-20 07:43:49 UTC (rev 48106)
@@ -336,7 +336,7 @@
         cls.fisheye_fov = FloatProperty(
                 name="Field of View",
                 description="Field of view for the fisheye lens",
-                min=0.1745, soft_max=2*math.pi, max=10.0*math.pi,
+                min=0.1745, soft_max=2 * math.pi, max=10.0 * math.pi,
                 subtype='ANGLE',
                 default=math.pi,
                 )

Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py	2012-06-20 07:31:19 UTC (rev 48105)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py	2012-06-20 07:43:49 UTC (rev 48106)
@@ -85,6 +85,7 @@
             sub.prop(cscene, "ao_samples", text="AO")
             sub.prop(cscene, "mesh_light_samples", text="Mesh Light")
 
+
 class CyclesRender_PT_light_paths(CyclesButtonsPanel, Panel):
     bl_label = "Light Paths"
     bl_options = {'DEFAULT_CLOSED'}
@@ -545,6 +546,7 @@
         if not panel_node_draw(layout, lamp, 'OUTPUT_LAMP', 'Surface'):
             layout.prop(lamp, "color")
 
+
 class CyclesLamp_PT_spot(CyclesButtonsPanel, Panel):
     bl_label = "Spot Shape"
     bl_context = "data"
@@ -569,6 +571,7 @@
         col = split.column()
         col.prop(lamp, "show_cone")
 
+
 class CyclesWorld_PT_surface(CyclesButtonsPanel, Panel):
     bl_label = "Surface"
     bl_context = "world"

Modified: branches/soc-2011-tomato/release/datafiles/clkernelstoh.py
===================================================================
--- branches/soc-2011-tomato/release/datafiles/clkernelstoh.py	2012-06-20 07:31:19 UTC (rev 48105)
+++ branches/soc-2011-tomato/release/datafiles/clkernelstoh.py	2012-06-20 07:43:49 UTC (rev 48106)
@@ -61,9 +61,9 @@
 
 lines = fpin.readlines()
 for line in lines:
-	fpout.write("\"")
-	fpout.write(line.rstrip())
-	fpout.write("\\n\" \\\n")
+    fpout.write("\"")
+    fpout.write(line.rstrip())
+    fpout.write("\\n\" \\\n")
 fpout.write("\"\\0\";\n")
 
 fpin.close()

Modified: branches/soc-2011-tomato/release/scripts/modules/addon_utils.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/addon_utils.py	2012-06-20 07:31:19 UTC (rev 48105)
+++ branches/soc-2011-tomato/release/scripts/modules/addon_utils.py	2012-06-20 07:43:49 UTC (rev 48106)
@@ -183,8 +183,8 @@
     del modules_stale
 
     mod_list = list(module_cache.values())
-    mod_list.sort(key=lambda mod: (mod.bl_info['category'],
-                                   mod.bl_info['name'],
+    mod_list.sort(key=lambda mod: (mod.bl_info["category"],
+                                   mod.bl_info["name"],
                                    ))
     return mod_list
 

Modified: branches/soc-2011-tomato/release/scripts/modules/animsys_refactor.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/animsys_refactor.py	2012-06-20 07:31:19 UTC (rev 48105)
+++ branches/soc-2011-tomato/release/scripts/modules/animsys_refactor.py	2012-06-20 07:43:49 UTC (rev 48106)
@@ -887,9 +887,9 @@
     # Example, should be called externally
     # (class, from, to)
     replace_ls = [
-        ('AnimVizMotionPaths', 'frame_after', 'frame_after'),
-        ('AnimVizMotionPaths', 'frame_before', 'frame_before'),
-        ('AnimVizOnionSkinning', 'frame_after', 'frame_after'),
+        ("AnimVizMotionPaths", "frame_after", "frame_after"),
+        ("AnimVizMotionPaths", "frame_before", "frame_before"),
+        ("AnimVizOnionSkinning", "frame_after", "frame_after"),
     ]
 
     update_data_paths(replace_ls)

Modified: branches/soc-2011-tomato/release/scripts/modules/blend_render_info.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/blend_render_info.py	2012-06-20 07:31:19 UTC (rev 48105)
+++ branches/soc-2011-tomato/release/scripts/modules/blend_render_info.py	2012-06-20 07:43:49 UTC (rev 48106)
@@ -36,14 +36,14 @@
 
     import struct
 
-    blendfile = open(path, 'rb')
+    blendfile = open(path, "rb")
 
     head = blendfile.read(7)
 
     if head[0:2] == b'\x1f\x8b':  # gzip magic
         import gzip
         blendfile.close()
-        blendfile = gzip.open(path, 'rb')
+        blendfile = gzip.open(path, "rb")
         head = blendfile.read(7)
 
     if head != b'BLENDER':
@@ -80,7 +80,7 @@
         scene_name = scene_name[:scene_name.index(b'\0')]
 
         try:
-            scene_name = str(scene_name, 'utf8')
+            scene_name = str(scene_name, "utf8")
         except TypeError:
             pass
 

Modified: branches/soc-2011-tomato/release/scripts/modules/bpy/__init__.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy/__init__.py	2012-06-20 07:31:19 UTC (rev 48105)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy/__init__.py	2012-06-20 07:43:49 UTC (rev 48106)
@@ -63,11 +63,11 @@
     #~ if "-d" in sys.argv: # Enable this to measure start up speed
     if 0:
         import cProfile
-        cProfile.run('import bpy; bpy.utils.load_scripts()', 'blender.prof')
+        cProfile.run("import bpy; bpy.utils.load_scripts()", "blender.prof")
 
         import pstats
-        p = pstats.Stats('blender.prof')
-        p.sort_stats('cumulative').print_stats(100)
+        p = pstats.Stats("blender.prof")
+        p.sort_stats("cumulative").print_stats(100)
 
     else:
         utils.load_scripts()

Modified: branches/soc-2011-tomato/release/scripts/modules/bpy/ops.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy/ops.py	2012-06-20 07:31:19 UTC (rev 48105)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy/ops.py	2012-06-20 07:43:49 UTC (rev 48106)
@@ -74,7 +74,7 @@
 
     eg. bpy.ops.object
     '''
-    __keys__ = ('module',)
+    __keys__ = ("module",)
 
     def __init__(self, module):
         self.module = module
@@ -111,7 +111,7 @@
     eg. bpy.ops.object.somefunc
     '''
 
-    __keys__ = ('module', 'func')
+    __keys__ = ("module", "func")
 
     def _get_doc(self):
         return op_as_string(self.idname())

Modified: branches/soc-2011-tomato/release/scripts/modules/bpy/utils.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy/utils.py	2012-06-20 07:31:19 UTC (rev 48105)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy/utils.py	2012-06-20 07:43:49 UTC (rev 48106)
@@ -489,7 +489,7 @@
 
     try:
         keyfile = open(filepath)
-        exec(compile(keyfile.read(), filepath, 'exec'), {"__file__": filepath})
+        exec(compile(keyfile.read(), filepath, "exec"), {"__file__": filepath})
         keyfile.close()
     except:
         import traceback

Modified: branches/soc-2011-tomato/release/scripts/modules/bpy_extras/image_utils.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy_extras/image_utils.py	2012-06-20 07:31:19 UTC (rev 48105)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy_extras/image_utils.py	2012-06-20 07:43:49 UTC (rev 48106)
@@ -71,7 +71,7 @@
     def _image_load_placeholder(path):
         name = bpy.path.basename(path)
         if type(name) == bytes:
-            name = name.decode('utf-8', "replace")
+            name = name.decode("utf-8", "replace")
         image = bpy.data.images.new(name, 128, 128)
         # allow the path to be resolved later
         image.filepath = path

Modified: branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py	2012-06-20 07:31:19 UTC (rev 48105)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list