[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36965] branches/soc-2010-jwilkins: Merge Cleanup.

Jason Wilkins Jason.A.Wilkins at gmail.com
Sat May 28 05:18:44 CEST 2011 

Revision: 36965
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36965
Author:   jwilkins
Date:     2011-05-28 03:18:40 +0000 (Sat, 28 May 2011)
Log Message:
-----------
Merge Cleanup.
Forth to make sure branch is a copy of trunk.  This time the revision is 36950.  Mostly svn property fixes.  Biggest concern was missing 'svn:eol-style = native' tags, but also a lot of random 'svn:mergeinfo=' tages (yes, the merge info was empty).  Probably need to remove these in trunk, but I added them back to clean up my diff.

Modified Paths:
--------------
    branches/soc-2010-jwilkins/release/scripts/modules/sys_info.py
    branches/soc-2010-jwilkins/release/scripts/presets/render/HDV_NTSC_1080p.py
    branches/soc-2010-jwilkins/release/scripts/presets/render/HDV_PAL_1080p.py
    branches/soc-2010-jwilkins/source/SConscript
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_cpu.h
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/cpu.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/info_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/info_report.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/textview.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/textview.h
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_geometry.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_geometry.h
    branches/soc-2010-jwilkins/source/blenderplayer/CMakeLists.txt

Property Changed:
----------------
    branches/soc-2010-jwilkins/intern/ghost/GHOST_Path-api.h
    branches/soc-2010-jwilkins/release/scripts/modules/bpy/ops.py
    branches/soc-2010-jwilkins/release/scripts/modules/bpy/utils.py
    branches/soc-2010-jwilkins/release/scripts/modules/sys_info.py
    branches/soc-2010-jwilkins/release/scripts/op/
    branches/soc-2010-jwilkins/release/scripts/presets/render/HDV_NTSC_1080p.py
    branches/soc-2010-jwilkins/release/scripts/presets/render/HDV_PAL_1080p.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/chicken.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/cream.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/ketchup.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/marble.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/potato.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/skim_milk.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/skin1.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/skin2.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_world.py
    branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2010-jwilkins/release/scripts/ui/
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_cpu.h
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/cpu.c
    branches/soc-2010-jwilkins/source/blender/editors/datafiles/startup.blend.c
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_particle.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_physics.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_render.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_transform.h
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/mesh/mesh_data.c
    branches/soc-2010-jwilkins/source/blender/editors/metaball/mball_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_add.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_constraint.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_group.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_hook.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_lattice.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_relations.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_select.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_shapekey.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_transform.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_vgroup.c
    branches/soc-2010-jwilkins/source/blender/editors/render/
    branches/soc-2010-jwilkins/source/blender/editors/render/render_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/render/render_preview.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_shading.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_update.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2010-jwilkins/source/blender/editors/space_image/image_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/info_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/info_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/info_report.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/textview.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/textview.h
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_state.c
    branches/soc-2010-jwilkins/source/blender/editors/space_userpref/
    branches/soc-2010-jwilkins/source/blender/editors/space_userpref/space_userpref.c
    branches/soc-2010-jwilkins/source/blender/editors/space_userpref/userpref_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_userpref/userpref_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Color.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Euler.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Matrix.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Vector.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_geometry.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_geometry.h


Property changes on: branches/soc-2010-jwilkins/intern/ghost/GHOST_Path-api.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2010-jwilkins/release/scripts/modules/bpy/ops.py
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: branches/soc-2010-jwilkins/release/scripts/modules/bpy/utils.py
___________________________________________________________________
Added: svn:mergeinfo
   + 

Modified: branches/soc-2010-jwilkins/release/scripts/modules/sys_info.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/modules/sys_info.py	2011-05-28 01:29:56 UTC (rev 36964)
+++ branches/soc-2010-jwilkins/release/scripts/modules/sys_info.py	2011-05-28 03:18:40 UTC (rev 36965)
@@ -1,112 +1,112 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-# classes for extracting info from blenders internal classes
-
-import bpy
-import bgl
-
-import sys
-
-
-def cutPoint(text, length):
-    "Returns position of the last space found before 'length' chars"
-    l = length
-    c = text[l]
-    while c != ' ':
-        l -= 1
-        if l == 0:
-            return length  # no space found
-        c = text[l]
-    return l
-
-
-def textWrap(text, length=70):
-    lines = []
-    while len(text) > 70:
-        cpt = cutPoint(text, length)
-        line, text = text[:cpt], text[cpt + 1:]
-        lines.append(line)
-    lines.append(text)
-    return lines
-
-
-def write_sysinfo(op):
-    output_filename = "system-info.txt"
-
-    output = bpy.data.texts.get(output_filename)
-    if output:
-        output.clear()
-    else:
-        output = bpy.data.texts.new(name=output_filename)
-
-    header = '= Blender {} System Information =\n'.format(bpy.app.version_string)
-    lilies = '{}\n\n'.format(len(header) * '=')
-    firstlilies = '{}\n'.format(len(header) * '=')
-    output.write(firstlilies)
-    output.write(header)
-    output.write(lilies)
-
-    # build info
-    output.write('\nBlender:\n')
-    output.write(lilies)
-    output.write('version {}, revision {}. {}\n'.format(bpy.app.version_string, bpy.app.build_revision, bpy.app.build_type))
-    output.write('build date: {}, {}\n'.format(bpy.app.build_date, bpy.app.build_time))
-    output.write('platform: {}\n'.format(bpy.app.build_platform))
-    output.write('binary path: {}\n'.format(bpy.app.binary_path))
-    output.write('build cflags: {}\n'.format(bpy.app.build_cflags))
-    output.write('build cxxflags: {}\n'.format(bpy.app.build_cxxflags))
-    output.write('build linkflags: {}\n'.format(bpy.app.build_linkflags))
-    output.write('build system: {}\n'.format(bpy.app.build_system))
-
-    # python info
-    output.write('\nPython:\n')
-    output.write(lilies)
-    output.write('version: {}\n'.format(sys.version))
-    output.write('paths:\n')
-    for p in sys.path:
-        output.write('\t{}\n'.format(p))
-
-    output.write('\nDirectories:\n')
-    output.write(lilies)
-    output.write('scripts: {}\n'.format(bpy.utils.script_paths()))
-    output.write('user scripts: {}\n'.format(bpy.utils.user_script_path()))
-    output.write('datafiles: {}\n'.format(bpy.utils.user_resource('DATAFILES')))
-    output.write('config: {}\n'.format(bpy.utils.user_resource('CONFIG')))
-    output.write('scripts : {}\n'.format(bpy.utils.user_resource('SCRIPTS')))
-    output.write('autosave: {}\n'.format(bpy.utils.user_resource('AUTOSAVE')))
-    output.write('tempdir: {}\n'.format(bpy.app.tempdir))
-
-    if bpy.app.background:
-        output.write('\nOpenGL: missing, background mode\n')
-    else:
-        output.write('\nOpenGL\n')
-        output.write(lilies)
-        output.write('renderer:\t{}\n'.format(bgl.glGetString(bgl.GL_RENDERER)))
-        output.write('vendor:\t\t{}\n'.format(bgl.glGetString(bgl.GL_VENDOR)))
-        output.write('version:\t{}\n'.format(bgl.glGetString(bgl.GL_VERSION)))
-        output.write('extensions:\n')
-
-        glext = bgl.glGetString(bgl.GL_EXTENSIONS)
-        glext = textWrap(glext, 70)
-        for l in glext:
-            output.write('\t\t{}\n'.format(l))
-
-    op.report({'INFO'}, "System information generated in 'system-info.txt'")
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+
+# classes for extracting info from blenders internal classes
+
+import bpy
+import bgl
+
+import sys
+
+
+def cutPoint(text, length):
+    "Returns position of the last space found before 'length' chars"
+    l = length
+    c = text[l]
+    while c != ' ':
+        l -= 1
+        if l == 0:
+            return length  # no space found
+        c = text[l]
+    return l
+
+
+def textWrap(text, length=70):
+    lines = []
+    while len(text) > 70:
+        cpt = cutPoint(text, length)
+        line, text = text[:cpt], text[cpt + 1:]
+        lines.append(line)
+    lines.append(text)
+    return lines
+
+
+def write_sysinfo(op):
+    output_filename = "system-info.txt"
+
+    output = bpy.data.texts.get(output_filename)
+    if output:
+        output.clear()
+    else:
+        output = bpy.data.texts.new(name=output_filename)
+
+    header = '= Blender {} System Information =\n'.format(bpy.app.version_string)
+    lilies = '{}\n\n'.format(len(header) * '=')
+    firstlilies = '{}\n'.format(len(header) * '=')
+    output.write(firstlilies)
+    output.write(header)
+    output.write(lilies)
+
+    # build info
+    output.write('\nBlender:\n')
+    output.write(lilies)
+    output.write('version {}, revision {}. {}\n'.format(bpy.app.version_string, bpy.app.build_revision, bpy.app.build_type))
+    output.write('build date: {}, {}\n'.format(bpy.app.build_date, bpy.app.build_time))
+    output.write('platform: {}\n'.format(bpy.app.build_platform))
+    output.write('binary path: {}\n'.format(bpy.app.binary_path))
+    output.write('build cflags: {}\n'.format(bpy.app.build_cflags))
+    output.write('build cxxflags: {}\n'.format(bpy.app.build_cxxflags))
+    output.write('build linkflags: {}\n'.format(bpy.app.build_linkflags))
+    output.write('build system: {}\n'.format(bpy.app.build_system))
+
+    # python info
+    output.write('\nPython:\n')
+    output.write(lilies)
+    output.write('version: {}\n'.format(sys.version))
+    output.write('paths:\n')
+    for p in sys.path:
+        output.write('\t{}\n'.format(p))
+
+    output.write('\nDirectories:\n')
+    output.write(lilies)
+    output.write('scripts: {}\n'.format(bpy.utils.script_paths()))
+    output.write('user scripts: {}\n'.format(bpy.utils.user_script_path()))
+    output.write('datafiles: {}\n'.format(bpy.utils.user_resource('DATAFILES')))
+    output.write('config: {}\n'.format(bpy.utils.user_resource('CONFIG')))
+    output.write('scripts : {}\n'.format(bpy.utils.user_resource('SCRIPTS')))
+    output.write('autosave: {}\n'.format(bpy.utils.user_resource('AUTOSAVE')))
+    output.write('tempdir: {}\n'.format(bpy.app.tempdir))
+
+    if bpy.app.background:
+        output.write('\nOpenGL: missing, background mode\n')
+    else:
+        output.write('\nOpenGL\n')
+        output.write(lilies)
+        output.write('renderer:\t{}\n'.format(bgl.glGetString(bgl.GL_RENDERER)))
+        output.write('vendor:\t\t{}\n'.format(bgl.glGetString(bgl.GL_VENDOR)))
+        output.write('version:\t{}\n'.format(bgl.glGetString(bgl.GL_VERSION)))
+        output.write('extensions:\n')
+
+        glext = bgl.glGetString(bgl.GL_EXTENSIONS)
+        glext = textWrap(glext, 70)
+        for l in glext:
+            output.write('\t\t{}\n'.format(l))
+
+    op.report({'INFO'}, "System information generated in 'system-info.txt'")


Property changes on: branches/soc-2010-jwilkins/release/scripts/modules/sys_info.py
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2010-jwilkins/release/scripts/op
___________________________________________________________________
Deleted: svn:ignore
   - *.pyc


Modified: branches/soc-2010-jwilkins/release/scripts/presets/render/HDV_NTSC_1080p.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/presets/render/HDV_NTSC_1080p.py	2011-05-28 01:29:56 UTC (rev 36964)
+++ branches/soc-2010-jwilkins/release/scripts/presets/render/HDV_NTSC_1080p.py	2011-05-28 03:18:40 UTC (rev 36965)
@@ -1,8 +1,8 @@
-import bpy
-bpy.context.scene.render.resolution_x = 1440
-bpy.context.scene.render.resolution_y = 1080
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 4
-bpy.context.scene.render.pixel_aspect_y = 3
-bpy.context.scene.render.fps = 30
-bpy.context.scene.render.fps_base = 1.001
+import bpy
+bpy.context.scene.render.resolution_x = 1440
+bpy.context.scene.render.resolution_y = 1080
+bpy.context.scene.render.resolution_percentage = 100

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list