[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43476] branches/soc-2011-onion-uv-tools: merge with trunk 43474 and use fix by Campbell here as well

Antony Riakiotakis kalast at gmail.com
Tue Jan 17 20:04:31 CET 2012


Revision: 43476
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43476
Author:   psy-fi
Date:     2012-01-17 19:04:31 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
merge with trunk 43474 and use fix by Campbell here as well

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/enums.py
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/ui.py
    branches/soc-2011-onion-uv-tools/release/scripts/modules/rna_xml.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/clip.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_time.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-onion-uv-tools/source/tests/bl_mesh_modifiers.py

Added Paths:
-----------
    branches/soc-2011-onion-uv-tools/extern/carve/patches/gcc46.patch
    branches/soc-2011-onion-uv-tools/extern/carve/patches/mingw.patch

Property Changed:
----------------
    branches/soc-2011-onion-uv-tools/
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/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
/trunk/blender:39665-43466
   + /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/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
/trunk/blender:39665-43474

Copied: branches/soc-2011-onion-uv-tools/extern/carve/patches/gcc46.patch (from rev 43474, trunk/blender/extern/carve/patches/gcc46.patch)
===================================================================
--- branches/soc-2011-onion-uv-tools/extern/carve/patches/gcc46.patch	                        (rev 0)
+++ branches/soc-2011-onion-uv-tools/extern/carve/patches/gcc46.patch	2012-01-17 19:04:31 UTC (rev 43476)
@@ -0,0 +1,11 @@
+diff -r 525472fb477a include/carve/polyline_iter.hpp
+--- a/include/carve/polyline_iter.hpp	Sun Jan 15 23:07:40 2012 -0500
++++ b/include/carve/polyline_iter.hpp	Wed Jan 18 00:41:13 2012 +0600
+@@ -20,6 +20,7 @@
+ #include <list>
+ #include <iterator>
+ #include <limits>
++#include <cstddef>
+ 
+ #include <carve/polyline_decl.hpp>
+ 

Copied: branches/soc-2011-onion-uv-tools/extern/carve/patches/mingw.patch (from rev 43474, trunk/blender/extern/carve/patches/mingw.patch)
===================================================================
--- branches/soc-2011-onion-uv-tools/extern/carve/patches/mingw.patch	                        (rev 0)
+++ branches/soc-2011-onion-uv-tools/extern/carve/patches/mingw.patch	2012-01-17 19:04:31 UTC (rev 43476)
@@ -0,0 +1,15 @@
+diff -r 525472fb477a include/carve/win32.h
+--- a/include/carve/win32.h	Sun Jan 15 23:07:40 2012 -0500
++++ b/include/carve/win32.h	Wed Jan 18 00:40:10 2012 +0600
+@@ -8,9 +8,11 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
++#if !defined(__MINGW32__)
+ inline int strcasecmp(const char *a, const char *b) {
+   return _stricmp(a,b);
+ }
++#endif
+ 
+ inline void srandom(unsigned long input) {
+   srand(input);

Modified: branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/enums.py
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/enums.py	2012-01-17 19:03:18 UTC (rev 43475)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/enums.py	2012-01-17 19:04:31 UTC (rev 43476)
@@ -21,8 +21,8 @@
 from . import engine
 
 devices = (
-	("CPU", "CPU", "Use CPU for rendering"),
-	("GPU", "GPU Compute", "Use GPU compute device for rendering, configured in user preferences"))
+    ("CPU", "CPU", "Use CPU for rendering"),
+    ("GPU", "GPU Compute", "Use GPU compute device for rendering, configured in user preferences"))
 
 feature_set = (
     ("SUPPORTED", "Supported", "Only use finished and supported features"),

Modified: branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/ui.py	2012-01-17 19:03:18 UTC (rev 43475)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/ui.py	2012-01-17 19:04:31 UTC (rev 43476)
@@ -149,6 +149,7 @@
         sub.prop(cscene, "debug_use_spatial_splits")
         sub.prop(cscene, "use_cache")
 
+
 class CyclesRender_PT_layers(CyclesButtonsPanel, Panel):
     bl_label = "Layers"
     bl_options = {'DEFAULT_CLOSED'}
@@ -708,7 +709,7 @@
     scene = context.scene
     layout = self.layout
 
-    if scene.render.engine == "CYCLES":
+    if scene.render.engine == 'CYCLES':
         cscene = scene.cycles
 
         layout.prop(cscene, "feature_set")
@@ -719,6 +720,7 @@
         elif device_type == 'OPENCL' and cscene.feature_set == 'EXPERIMENTAL':
             layout.prop(cscene, "device")
 
+
 def draw_pause(self, context):
     layout = self.layout
     scene = context.scene
@@ -726,7 +728,7 @@
     if scene.render.engine == "CYCLES":
         view = context.space_data
 
-        if view.viewport_shade == "RENDERED":
+        if view.viewport_shade == 'RENDERED':
             cscene = scene.cycles
             layout.prop(cscene, "preview_pause", icon="PAUSE", text="")
 

Modified: branches/soc-2011-onion-uv-tools/release/scripts/modules/rna_xml.py
===================================================================
--- branches/soc-2011-onion-uv-tools/release/scripts/modules/rna_xml.py	2012-01-17 19:03:18 UTC (rev 43475)
+++ branches/soc-2011-onion-uv-tools/release/scripts/modules/rna_xml.py	2012-01-17 19:04:31 UTC (rev 43476)
@@ -141,7 +141,7 @@
                                     return number_to_str(s, subsubvalue_type)
                                 else:
                                     return " ".join([str_recursive(si) for si in s])
-                            
+
                             array_value = " ".join(str_recursive(v) for v in subvalue_rna)
 
                         node_attrs.append("%s=\"%s\"" % (prop, array_value))
@@ -308,13 +308,13 @@
     rna2xml_node(root_xml, root_rna)
 
 
-
 # -----------------------------------------------------------------------------
 # Utility function used by presets.
 # The idea is you can run a preset like a script with a few args.
 #
 # This roughly matches the operator 'bpy.ops.script.python_file_run'
 
+
 def _get_context_val(context, path):
     path_full = "context." + path
     try:
@@ -328,6 +328,7 @@
 
     return value
 
+
 def xml_file_run(context, filepath, rna_map):
 
     import xml.dom.minidom

Modified: branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/clip.py
===================================================================
--- branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/clip.py	2012-01-17 19:03:18 UTC (rev 43475)
+++ branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/clip.py	2012-01-17 19:04:31 UTC (rev 43476)
@@ -76,6 +76,7 @@
 
     return camera
 
+
 def CLIP_track_view_selected(sc, track):
     if track.select_anchor:
         return True
@@ -118,7 +119,7 @@
         constraint.track = track.name
         constraint.use_3d_position = False
         constraint.object = tracking_object.name
-        constraint.camera = CLIP_camera_for_clip(context, clip);
+        constraint.camera = CLIP_camera_for_clip(context, clip)
 
     def execute(self, context):
         sc = context.space_data
@@ -127,7 +128,7 @@
 
         for track in tracking_object.tracks:
             if CLIP_track_view_selected(sc, track):
-                self._link_track(context, clip, tracking_object ,track)
+                self._link_track(context, clip, tracking_object, track)
 
         return {'FINISHED'}
 

Modified: branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/wm.py
===================================================================
--- branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/wm.py	2012-01-17 19:03:18 UTC (rev 43475)
+++ branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/wm.py	2012-01-17 19:04:31 UTC (rev 43476)
@@ -166,9 +166,10 @@
         if attr is None:
             return {'CANCELLED'}
 
+        toolsettings = context.tool_settings
         for i, brush in enumerate((cur for cur in bpy.data.brushes if getattr(cur, attr))):
             if i == self.index:
-                getattr(context.tool_settings, self.mode).brush = brush
+                getattr(toolsettings, self.mode).brush = brush
                 return {'FINISHED'}
 
         return {'CANCELLED'}
@@ -1768,4 +1769,3 @@
         info = addon_utils.module_bl_info(mod)
         info["show_expanded"] = not info["show_expanded"]
         return {'FINISHED'}
-

Modified: branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_game.py
===================================================================
--- branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_game.py	2012-01-17 19:03:18 UTC (rev 43475)
+++ branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_game.py	2012-01-17 19:04:31 UTC (rev 43476)
@@ -287,7 +287,7 @@
         col = row.column()
         col.prop(gs, "use_desktop")
         col.active = gs.show_fullscreen
-        
+
         col = layout.column()
         col.label(text="Quality:")
         col.prop(gs, "samples")

Modified: branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_render.py	2012-01-17 19:03:18 UTC (rev 43475)
+++ branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_render.py	2012-01-17 19:04:31 UTC (rev 43476)
@@ -418,9 +418,9 @@
         rd = context.scene.render
 
         layout.active = rd.use_stamp
-        
+
         layout.prop(rd, "stamp_font_size", text="Font Size")
-        
+
         row = layout.row()
         row.column().prop(rd, "stamp_foreground", slider=True)
         row.column().prop(rd, "stamp_background", slider=True)
@@ -433,7 +433,7 @@
         col.prop(rd, "use_stamp_render_time", text="RenderTime")
         col.prop(rd, "use_stamp_frame", text="Frame")
         col.prop(rd, "use_stamp_scene", text="Scene")
-        
+
         col = split.column()
         col.prop(rd, "use_stamp_camera", text="Camera")
         col.prop(rd, "use_stamp_lens", text="Lens")

Modified: branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_image.py	2012-01-17 19:03:18 UTC (rev 43475)
+++ branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_image.py	2012-01-17 19:04:31 UTC (rev 43476)
@@ -706,8 +706,8 @@
 
     def draw(self, context):
         layout = self.layout
-        settings = context.tool_settings.image_paint
-        brush = settings.brush
+        toolsettings = context.tool_settings.image_paint

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list