[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59099] branches/soc-2013-cycles_mblur: Merged trunk into branch.

Gavin Howard gavin.d.howard at gmail.com
Tue Aug 13 07:01:05 CEST 2013


Revision: 59099
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59099
Author:   gdh
Date:     2013-08-13 05:01:05 +0000 (Tue, 13 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59073 to r59098.

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

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp
    branches/soc-2013-cycles_mblur/release/scripts/modules/bpy/path.py
    branches/soc-2013-cycles_mblur/release/scripts/modules/bpy_extras/image_utils.py
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/action.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/armature.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/camera.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/curve.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/image.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/object.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/bmesh.h
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_construct.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_construct.h
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_core.h
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_marking.h
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_inset.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_split_edges.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_subdivide_edgering.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_edgesplit.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_edgesplit.h
    branches/soc-2013-cycles_mblur/source/blender/editors/armature/pose_edit.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_rip.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_edit.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_image_types.h
    branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2013-cycles_mblur/source/blender/python/bmesh/bmesh_py_utils.c
    branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_KetsjiEngine.h

Added Paths:
-----------
    branches/soc-2013-cycles_mblur/release/text/GPL3-license.txt
    branches/soc-2013-cycles_mblur/release/text/jemalloc-license.txt

Property Changed:
----------------
    branches/soc-2013-cycles_mblur/
    branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/


Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_dev:58091-58422
/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,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59072
   + /branches/ge_dev:58091-58422
/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,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59098

Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp	2013-08-13 04:35:14 UTC (rev 59098)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp	2013-08-13 05:01:05 UTC (rev 59099)
@@ -496,7 +496,7 @@
 	
 	if(show_emitter) {
 		hide_triangles = false;
-		return (hide_as_dupli_parent || hide_as_dupli_child_original);
+		return false;
 	}
 	else if(hair_present) {
 		hide_triangles = true;

Modified: branches/soc-2013-cycles_mblur/release/scripts/modules/bpy/path.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/modules/bpy/path.py	2013-08-13 04:35:14 UTC (rev 59098)
+++ branches/soc-2013-cycles_mblur/release/scripts/modules/bpy/path.py	2013-08-13 05:01:05 UTC (rev 59099)
@@ -35,6 +35,7 @@
     "extensions_audio",
     "is_subdir",
     "module_names",
+    "reduce_dirs",
     "relpath",
     "resolve_ncase",
     )
@@ -304,3 +305,27 @@
     Use for Windows compatibility.
     """
     return _os.path.basename(path[2:] if path[:2] in {"//", b"//"} else path)
+
+
+def reduce_dirs(dirs):
+    """
+    Given a sequence of directories, remove duplicates and
+    any directories nested in one of the other paths.
+    (Useful for recursive path searching).
+
+    :arg dirs: Sequence of directory paths.
+    :type dirs: sequence
+    :return: A unique list of paths.
+    :rtype: list
+    """
+    dirs = list({_os.path.normpath(_os.path.abspath(d)) for d in dirs})
+    dirs.sort(key=lambda d: len(d))
+    for i in range(len(dirs) -1, -1, -1):
+        for j in range(i):
+            print(i, j)
+            if len(dirs[i]) == len(dirs[j]):
+                break
+            elif is_subdir(dirs[i], dirs[j]):
+                del dirs[i]
+                break
+    return dirs

Modified: branches/soc-2013-cycles_mblur/release/scripts/modules/bpy_extras/image_utils.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/modules/bpy_extras/image_utils.py	2013-08-13 04:35:14 UTC (rev 59098)
+++ branches/soc-2013-cycles_mblur/release/scripts/modules/bpy_extras/image_utils.py	2013-08-13 05:01:05 UTC (rev 59099)
@@ -66,8 +66,6 @@
     import os
     import bpy
 
-    # TODO: recursive
-
     # -------------------------------------------------------------------------
     # Utility Functions
 
@@ -111,6 +109,18 @@
 
         return image
 
+    def _recursive_search(paths, filename_check):
+        for path in paths:
+            for dirpath, dirnames, filenames in os.walk(path):
+
+                # skip '.svn'
+                if dirpath[0] in {".", b'.'}:
+                    continue
+
+                for filename in filenames:
+                    if filename_check(filename):
+                        yield os.path.join(dirpath, filename)
+
     # -------------------------------------------------------------------------
 
     if verbose:
@@ -138,6 +148,28 @@
             if os.path.exists(nfilepath):
                 return _image_load(nfilepath)
 
+    if recursive:
+        search_paths = []
+
+        for dirpath_test in (os.path.dirname(imagepath), dirname):
+            if os.path.exists(dirpath_test):
+                search_paths.append(dirpath_test)
+        search_paths[:] = bpy.path.reduce_dirs(search_paths)
+
+        imagepath_base = bpy.path.basename(imagepath)
+        if ncase_cmp:
+            imagepath_base = imagepath_base.lower()
+
+            def image_filter(fn):
+                return (imagepath_base == fn.lower())
+        else:
+            def image_filter(fn):
+                return (imagepath_base == fn)
+
+        nfilepath = next(_recursive_search(search_paths, image_filter), None)
+        if nfilepath is not None:
+            return _image_load(nfilepath)
+
     # None of the paths exist so return placeholder
     if place_holder:
         return _image_load_placeholder(imagepath)

Copied: branches/soc-2013-cycles_mblur/release/text/GPL3-license.txt (from rev 59098, trunk/blender/release/text/GPL3-license.txt)
===================================================================
--- branches/soc-2013-cycles_mblur/release/text/GPL3-license.txt	                        (rev 0)
+++ branches/soc-2013-cycles_mblur/release/text/GPL3-license.txt	2013-08-13 05:01:05 UTC (rev 59099)
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list