[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39251] branches/soc-2011-tomato: Merging r39191 through r39250 from trunk into soc-2011-tomato

Sergey Sharybin g.ulairi at gmail.com
Wed Aug 10 14:16:44 CEST 2011


Revision: 39251
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39251
Author:   nazgul
Date:     2011-08-10 12:16:44 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
Merging r39191 through r39250 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/doc/doxygen/Doxyfile
    branches/soc-2011-tomato/doc/python_api/rst/bge.logic.rst
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemSDL.cpp
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-tomato/release/scripts/templates/operator_modal.py
    branches/soc-2011-tomato/release/scripts/templates/operator_modal_timer.py
    branches/soc-2011-tomato/release/text/readme.html
    branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_array.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-tomato/source/tools/CTS/FBlender.py

Property Changed:
----------------
    branches/soc-2011-tomato/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:36831-39190
   + /trunk/blender:36831-39250

Modified: branches/soc-2011-tomato/doc/doxygen/Doxyfile
===================================================================
--- branches/soc-2011-tomato/doc/doxygen/Doxyfile	2011-08-10 10:32:23 UTC (rev 39250)
+++ branches/soc-2011-tomato/doc/doxygen/Doxyfile	2011-08-10 12:16:44 UTC (rev 39251)
@@ -31,7 +31,7 @@
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = "V2.58"
+PROJECT_NUMBER         = "V2.59"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer

Modified: branches/soc-2011-tomato/doc/python_api/rst/bge.logic.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/bge.logic.rst	2011-08-10 10:32:23 UTC (rev 39250)
+++ branches/soc-2011-tomato/doc/python_api/rst/bge.logic.rst	2011-08-10 12:16:44 UTC (rev 39251)
@@ -217,6 +217,12 @@
 
    Loads a scene into the game engine.
 
+   .. note::
+
+      This function is not effective immediately, the scene is queued
+      and added on the next logic cycle where it will be available
+      from `getSceneList`
+
    :arg name: The name of the scene
    :type name: string
    :arg overlay: Overlay or underlay (optional)

Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemSDL.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemSDL.cpp	2011-08-10 10:32:23 UTC (rev 39250)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemSDL.cpp	2011-08-10 12:16:44 UTC (rev 39251)
@@ -146,7 +146,7 @@
 	if ((key >= SDL_SCANCODE_A) && (key <= SDL_SCANCODE_Z)) {
 		type= GHOST_TKey( key - SDL_SCANCODE_A + int(GHOST_kKeyA));
 	} else if ((key >= SDL_SCANCODE_1) && (key <= SDL_SCANCODE_0)) {
-		type= GHOST_TKey(key - SDL_SCANCODE_1 + int(GHOST_kKey0));
+		type= (key == SDL_SCANCODE_0) ? GHOST_kKey0 : GHOST_TKey(key - SDL_SCANCODE_1 + int(GHOST_kKey1));
 	} else if ((key >= SDL_SCANCODE_F1) && (key <= SDL_SCANCODE_F12)) {
 		type= GHOST_TKey(key - SDL_SCANCODE_F1 + int(GHOST_kKeyF1));
 	} else if ((key >= SDL_SCANCODE_F13) && (key <= SDL_SCANCODE_F24)) {

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_lightmap.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_lightmap.py	2011-08-10 10:32:23 UTC (rev 39250)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_lightmap.py	2011-08-10 12:16:44 UTC (rev 39251)
@@ -23,7 +23,15 @@
 
 
 class prettyface(object):
-    __slots__ = "uv", "width", "height", "children", "xoff", "yoff", "has_parent", "rot"
+    __slots__ = ("uv",
+                 "width",
+                 "height",
+                 "children",
+                 "xoff",
+                 "yoff",
+                 "has_parent",
+                 "rot",
+                 )
 
     def __init__(self, data):
         self.has_parent = False
@@ -263,10 +271,9 @@
             del trylens
 
             def trilensdiff(t1, t2):
-                return\
-                abs(t1[1][t1[2][0]] - t2[1][t2[2][0]]) + \
-                abs(t1[1][t1[2][1]] - t2[1][t2[2][1]]) + \
-                abs(t1[1][t1[2][2]] - t2[1][t2[2][2]])
+                return (abs(t1[1][t1[2][0]] - t2[1][t2[2][0]]) +
+                        abs(t1[1][t1[2][1]] - t2[1][t2[2][1]]) +
+                        abs(t1[1][t1[2][2]] - t2[1][t2[2][2]]))
 
             while tri_lengths:
                 tri1 = tri_lengths.pop()
@@ -543,22 +550,51 @@
     bl_options = {'REGISTER', 'UNDO'}
 
     PREF_CONTEXT = bpy.props.EnumProperty(
+            name="Selection",
+            description="",
             items=(("SEL_FACES", "Selected Faces", "Space all UVs evently"),
                    ("ALL_FACES", "All Faces", "Average space UVs edge length of each loop"),
                    ("ALL_OBJECTS", "Selected Mesh Object", "Average space UVs edge length of each loop")
                    ),
-            name="Selection",
-            description="")
+            )
 
     # Image & UVs...
-    PREF_PACK_IN_ONE = BoolProperty(name="Share Tex Space", default=True, description="Objects Share texture space, map all objects into 1 uvmap")
-    PREF_NEW_UVLAYER = BoolProperty(name="New UV Layer", default=False, description="Create a new UV layer for every mesh packed")
-    PREF_APPLY_IMAGE = BoolProperty(name="New Image", default=False, description="Assign new images for every mesh (only one if shared tex space enabled)")
-    PREF_IMG_PX_SIZE = IntProperty(name="Image Size", min=64, max=5000, default=512, description="Width and Height for the new image")
-
+    PREF_PACK_IN_ONE = BoolProperty(
+            name="Share Tex Space",
+            description=("Objects Share texture space, map all objects "
+                         "into 1 uvmap"),
+            default=True,
+            )
+    PREF_NEW_UVLAYER = BoolProperty(
+            name="New UV Layer",
+            description="Create a new UV layer for every mesh packed",
+            default=False,
+            )
+    PREF_APPLY_IMAGE = BoolProperty(
+            name="New Image",
+            description=("Assign new images for every mesh (only one if "
+                         "shared tex space enabled)"),
+            default=False,
+            )
+    PREF_IMG_PX_SIZE = IntProperty(
+            name="Image Size",
+            description="Width and Height for the new image",
+            min=64, max=5000,
+            default=512,
+            )
     # UV Packing...
-    PREF_BOX_DIV = IntProperty(name="Pack Quality", min=1, max=48, default=12, description="Pre Packing before the complex boxpack")
-    PREF_MARGIN_DIV = FloatProperty(name="Margin", min=0.001, max=1.0, default=0.1, description="Size of the margin as a division of the UV")
+    PREF_BOX_DIV = IntProperty(
+            name="Pack Quality",
+            description="Pre Packing before the complex boxpack",
+            min=1, max=48,
+            default=12,
+            )
+    PREF_MARGIN_DIV = FloatProperty(
+            name="Margin",
+            description="Size of the margin as a division of the UV",
+            min=0.001, max=1.0,
+            default=0.1,
+            )
 
     def execute(self, context):
         kwargs = self.as_keywords()

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_curve.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_curve.py	2011-08-10 10:32:23 UTC (rev 39250)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_curve.py	2011-08-10 12:16:44 UTC (rev 39251)
@@ -361,7 +361,7 @@
         col.prop(text, "offset_y", text="Y")
 
 
-class DATA_PT_textboxes(CurveButtonsPanel, bpy.types.Panel):
+class DATA_PT_text_boxes(CurveButtonsPanel, bpy.types.Panel):
     bl_label = "Text Boxes"
 
     @classmethod

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py	2011-08-10 10:32:23 UTC (rev 39250)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py	2011-08-10 12:16:44 UTC (rev 39251)
@@ -352,7 +352,7 @@
         layout = self.layout
 
         layout.operator("wm.url_open", text="Manual", icon='HELP').url = 'http://wiki.blender.org/index.php/Doc:Manual'
-        layout.operator("wm.url_open", text="Release Log", icon='URL').url = 'http://www.blender.org/development/release-logs/blender-258/'
+        layout.operator("wm.url_open", text="Release Log", icon='URL').url = 'http://www.blender.org/development/release-logs/blender-259/'
 
         layout.separator()
 

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py	2011-08-10 10:32:23 UTC (rev 39250)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py	2011-08-10 12:16:44 UTC (rev 39251)
@@ -1076,17 +1076,25 @@
     bl_idname = "wm.addon_enable"
     bl_label = "Enable Add-On"
 
-    module = StringProperty(name="Module", description="Module name of the addon to enable")
+    module = StringProperty(
+            name="Module",
+            description="Module name of the addon to enable",
+            )
 
     def execute(self, context):
         mod = addon_utils.enable(self.module)
 
         if mod:
-            # check if add-on is written for current blender version, or raise a warning
             info = addon_utils.module_bl_info(mod)
 
-            if info.get("blender", (0, 0, 0)) > bpy.app.version:
-                self.report("WARNING','This script was written for a newer version of Blender and might not function (correctly).\nThe script is enabled though.")
+            info_ver = info.get("blender", (0, 0, 0))
+
+            if info_ver > bpy.app.version:
+                self.report({'WARNING'}, ("This script was written Blender "
+                                          "version %d.%d.%d and might not "
+                                          "function (correctly).\n"
+                                          "The script is enabled though.") %
+                                         info_ver)
             return {'FINISHED'}
         else:
             return {'CANCELLED'}

Modified: branches/soc-2011-tomato/release/scripts/templates/operator_modal.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/templates/operator_modal.py	2011-08-10 10:32:23 UTC (rev 39250)
+++ branches/soc-2011-tomato/release/scripts/templates/operator_modal.py	2011-08-10 12:16:44 UTC (rev 39251)
@@ -47,4 +47,4 @@
     register()
 
     # test call
-    bpy.ops.object.modal_operator()
+    bpy.ops.object.modal_operator('INVOKE_DEFAULT')


@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list