[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41937] branches/soc-2011-tomato: Re-copied trunk over tomato and merging r41929 through r41936 into tomato

Sergey Sharybin sergey.vfx at gmail.com
Wed Nov 16 21:53:00 CET 2011


Revision: 41937
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41937
Author:   nazgul
Date:     2011-11-16 20:53:00 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
Re-copied trunk over tomato and merging r41929 through r41936 into tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/build_files/cmake/Modules/FindPythonLibsUnix.cmake
    branches/soc-2011-tomato/intern/cycles/blender/CMakeLists.txt
    branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
    branches/soc-2011-tomato/intern/cycles/blender/blender_util.h
    branches/soc-2011-tomato/release/scripts/modules/bpy/path.py
    branches/soc-2011-tomato/release/scripts/presets/camera/Sony_A55.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/clip.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_dynamicpaint.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_Customdata.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_mesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-tomato/source/blender/blenlib/BLI_mempool.h
    branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_mempool.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2011-tomato/source/blender/editors/animation/anim_markers.c
    branches/soc-2011-tomato/source/blender/editors/screen/area.c
    branches/soc-2011-tomato/source/blender/editors/space_action/action_select.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_graph/graph_select.c
    branches/soc-2011-tomato/source/blender/editors/space_info/info_report.c
    branches/soc-2011-tomato/source/blender/editors/space_nla/nla_select.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_select.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/moviecache.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_dynamicpaint_types.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c

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


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41928
   + /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41936

Modified: branches/soc-2011-tomato/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/Modules/FindPythonLibsUnix.cmake	2011-11-16 20:48:21 UTC (rev 41936)
+++ branches/soc-2011-tomato/build_files/cmake/Modules/FindPythonLibsUnix.cmake	2011-11-16 20:53:00 UTC (rev 41937)
@@ -139,9 +139,9 @@
 
   # not used
   # SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+ENDIF()
 
-  MARK_AS_ADVANCED(
-    PYTHON_INCLUDE_DIR
-    PYTHON_LIBRARY
-  )
-ENDIF()
+MARK_AS_ADVANCED(
+  PYTHON_INCLUDE_DIR
+  PYTHON_LIBRARY
+)

Modified: branches/soc-2011-tomato/intern/cycles/blender/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/CMakeLists.txt	2011-11-16 20:48:21 UTC (rev 41936)
+++ branches/soc-2011-tomato/intern/cycles/blender/CMakeLists.txt	2011-11-16 20:53:00 UTC (rev 41937)
@@ -1,4 +1,11 @@
 
+set(BLENDER_INCLUDE_DIRS
+	${CMAKE_SOURCE_DIR}/intern/guardedalloc
+	${CMAKE_SOURCE_DIR}/source/blender/makesdna
+	${CMAKE_SOURCE_DIR}/source/blender/makesrna
+	${CMAKE_SOURCE_DIR}/source/blender/blenloader
+	${CMAKE_BINARY_DIR}/source/blender/makesrna/intern)
+
 set(INC
 	../render
 	../device

Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py	2011-11-16 20:48:21 UTC (rev 41936)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py	2011-11-16 20:53:00 UTC (rev 41937)
@@ -459,7 +459,7 @@
 
     @classmethod
     def poll(cls, context):
-        world = context.world
+        # world = context.world
         return False  # world and world.node_tree and CyclesButtonsPanel.poll(context)
 
     def draw(self, context):
@@ -493,7 +493,7 @@
 
     @classmethod
     def poll(cls, context):
-        mat = context.material
+        # mat = context.material
         return False  # mat and mat.node_tree and CyclesButtonsPanel.poll(context)
 
     def draw(self, context):
@@ -562,7 +562,7 @@
         pin_id = space.pin_id
         use_pin_id = space.use_pin_id
         user = context.texture_user
-        node = context.texture_node
+        # node = context.texture_node
 
         if not use_pin_id or not isinstance(pin_id, bpy.types.Texture):
             pin_id = None
@@ -638,7 +638,7 @@
     def draw(self, context):
         layout = self.layout
 
-        tex = context.texture
+        # tex = context.texture
         node = context.texture_node
 
         mapping = node.texture_mapping
@@ -664,15 +664,15 @@
 
     @classmethod
     def poll(cls, context):
-        tex = context.texture
-        node = context.texture_node
+        # tex = context.texture
+        # node = context.texture_node
         return False
         #return (node or (tex and tex.use_nodes)) and CyclesButtonsPanel.poll(context)
 
     def draw(self, context):
         layout = self.layout
 
-        tex = context.texture
+        # tex = context.texture
         node = context.texture_node
 
         mapping = node.color_mapping

Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_util.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_util.h	2011-11-16 20:48:21 UTC (rev 41936)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_util.h	2011-11-16 20:53:00 UTC (rev 41937)
@@ -176,7 +176,13 @@
 static inline string blender_absolute_path(BL::BlendData b_data, BL::ID b_id, const string& path)
 {
 	if(path.size() >= 2 && path[0] == '/' && path[1] == '/') {
-		string dirname = (b_id.library())? b_id.library().filepath(): b_data.filepath();
+		string dirname;
+		
+		if(b_id.library())
+			dirname = blender_absolute_path(b_data, b_id.library(), b_id.library().filepath());
+		else
+			dirname = b_data.filepath();
+
 		return path_join(path_dirname(dirname), path.substr(2));
 	}
 

Modified: branches/soc-2011-tomato/release/scripts/modules/bpy/path.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy/path.py	2011-11-16 20:48:21 UTC (rev 41936)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy/path.py	2011-11-16 20:53:00 UTC (rev 41937)
@@ -154,25 +154,23 @@
     returning a string with the path if found else return the original path.
     """
 
-    import os
-
     def _ncase_path_found(path):
-        if not path or os.path.exists(path):
+        if not path or _os.path.exists(path):
             return path, True
 
         # filename may be a directory or a file
-        filename = os.path.basename(path)
-        dirpath = os.path.dirname(path)
+        filename = _os.path.basename(path)
+        dirpath = _os.path.dirname(path)
 
         suffix = path[:0]  # "" but ensure byte/str match
         if not filename:  # dir ends with a slash?
             if len(dirpath) < len(path):
                 suffix = path[:len(path) - len(dirpath)]
 
-            filename = os.path.basename(dirpath)
-            dirpath = os.path.dirname(dirpath)
+            filename = _os.path.basename(dirpath)
+            dirpath = _os.path.dirname(dirpath)
 
-        if not os.path.exists(dirpath):
+        if not _os.path.exists(dirpath):
             if dirpath == path:
                 return path, False
 
@@ -184,8 +182,8 @@
         # at this point, the directory exists but not the file
 
         # we are expecting 'dirpath' to be a directory, but it could be a file
-        if os.path.isdir(dirpath):
-            files = os.listdir(dirpath)
+        if _os.path.isdir(dirpath):
+            files = _os.listdir(dirpath)
         else:
             return path, False
 
@@ -198,7 +196,7 @@
                 break
 
         if f_iter_nocase:
-            return os.path.join(dirpath, f_iter_nocase) + suffix, True
+            return _os.path.join(dirpath, f_iter_nocase) + suffix, True
         else:
             # cant find the right one, just return the path as is.
             return path, False
@@ -216,8 +214,7 @@
     :arg case_sensitive: Check for matching case when comparing extensions.
     :type case_sensitive: bool
     """
-    import os
-    fn_base, fn_ext = os.path.splitext(filepath)
+    fn_base, fn_ext = _os.path.splitext(filepath)
     if fn_base and fn_ext:
         if ((case_sensitive and ext == fn_ext) or
             (ext.lower() == fn_ext.lower())):

Modified: branches/soc-2011-tomato/release/scripts/presets/camera/Sony_A55.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/camera/Sony_A55.py	2011-11-16 20:48:21 UTC (rev 41936)
+++ branches/soc-2011-tomato/release/scripts/presets/camera/Sony_A55.py	2011-11-16 20:53:00 UTC (rev 41937)
@@ -2,4 +2,3 @@
 bpy.context.object.data.sensor_width = 23.4
 bpy.context.object.data.sensor_height = 15.6
 bpy.context.object.data.sensor_fit = 'HORIZONTAL'
-

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/clip.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/clip.py	2011-11-16 20:48:21 UTC (rev 41936)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/clip.py	2011-11-16 20:53:00 UTC (rev 41937)
@@ -86,14 +86,9 @@
 
     @classmethod
     def poll(cls, context):
-        if context.space_data.type != 'CLIP_EDITOR':
-            return False
-
         sc = context.space_data
-        clip = sc.clip
+        return (sc.type == 'CLIP_EDITOR') and sc.clip
 
-        return clip
-
     def execute(self, context):
         sc = context.space_data
         clip = sc.clip

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py	2011-11-16 20:48:21 UTC (rev 41936)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py	2011-11-16 20:53:00 UTC (rev 41937)
@@ -147,7 +147,7 @@
 
         # opengl buffer may fail, we can't help this, but best report it.
         try:
-            ret = bpy.ops.paint.image_from_view()
+            bpy.ops.paint.image_from_view()
         except RuntimeError as err:
             self.report({'ERROR'}, str(err))
             return {'CANCELLED'}

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py	2011-11-16 20:48:21 UTC (rev 41936)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py	2011-11-16 20:53:00 UTC (rev 41937)
@@ -106,7 +106,7 @@
     # luckily we don't do this!
     #
     # When we cant find the data owner assume no undo is needed.
-    data_path_head, data_path_sep, data_path_tail = data_path.rpartition(".")
+    data_path_head = data_path.rpartition(".")[0]
 
     if not data_path_head:
         return False

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py	2011-11-16 20:48:21 UTC (rev 41936)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py	2011-11-16 20:53:00 UTC (rev 41937)
@@ -46,7 +46,6 @@
         layout = self.layout
 
         md = context.dynamic_paint
-        ob = context.object
 
         layout.prop(md, "ui_type", expand=True)
 
@@ -129,7 +128,6 @@
 
         canvas = context.dynamic_paint.canvas_settings
         surface = canvas.canvas_surfaces.active
-        ob = context.object
 
         surface_type = surface.surface_type
 
@@ -370,8 +368,6 @@
                 md.canvas_settings.canvas_surfaces.active.is_cache_user)
 
     def draw(self, context):
-        layout = self.layout
-
         surface = context.dynamic_paint.canvas_settings.canvas_surfaces.active

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list