[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43412] branches/carve_booleans: Merging r43369 through r43411 from trunk into carve_booleans

Sergey Sharybin sergey.vfx at gmail.com
Mon Jan 16 08:32:50 CET 2012


Revision: 43412
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43412
Author:   nazgul
Date:     2012-01-16 07:32:38 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
Merging r43369 through r43411 from trunk into carve_booleans

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

Modified Paths:
--------------
    branches/carve_booleans/intern/cycles/blender/addon/__init__.py
    branches/carve_booleans/release/scripts/modules/addon_utils.py
    branches/carve_booleans/release/scripts/modules/animsys_refactor.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_clip.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_graph.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_nla.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_sequencer.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_time.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_view3d.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/carve_booleans/release/scripts/templates/addon_add_object.py
    branches/carve_booleans/source/blender/blenkernel/BKE_brush.h
    branches/carve_booleans/source/blender/blenkernel/BKE_main.h
    branches/carve_booleans/source/blender/blenkernel/BKE_movieclip.h
    branches/carve_booleans/source/blender/blenkernel/BKE_tracking.h
    branches/carve_booleans/source/blender/blenkernel/intern/brush.c
    branches/carve_booleans/source/blender/blenkernel/intern/colortools.c
    branches/carve_booleans/source/blender/blenkernel/intern/dynamicpaint.c
    branches/carve_booleans/source/blender/blenkernel/intern/image.c
    branches/carve_booleans/source/blender/blenkernel/intern/movieclip.c
    branches/carve_booleans/source/blender/blenkernel/intern/tracking.c
    branches/carve_booleans/source/blender/blenlib/BLI_math_color.h
    branches/carve_booleans/source/blender/blenlib/intern/math_color.c
    branches/carve_booleans/source/blender/blenloader/intern/readfile.c
    branches/carve_booleans/source/blender/editors/animation/anim_ops.c
    branches/carve_booleans/source/blender/editors/armature/armature_ops.c
    branches/carve_booleans/source/blender/editors/curve/curve_ops.c
    branches/carve_booleans/source/blender/editors/include/ED_view3d.h
    branches/carve_booleans/source/blender/editors/interface/interface_ops.c
    branches/carve_booleans/source/blender/editors/interface/interface_widgets.c
    branches/carve_booleans/source/blender/editors/interface/view2d_ops.c
    branches/carve_booleans/source/blender/editors/mesh/mesh_ops.c
    branches/carve_booleans/source/blender/editors/metaball/mball_ops.c
    branches/carve_booleans/source/blender/editors/object/object_ops.c
    branches/carve_booleans/source/blender/editors/physics/physics_ops.c
    branches/carve_booleans/source/blender/editors/render/render_opengl.c
    branches/carve_booleans/source/blender/editors/sculpt_paint/paint_image.c
    branches/carve_booleans/source/blender/editors/sculpt_paint/paint_intern.h
    branches/carve_booleans/source/blender/editors/sculpt_paint/paint_ops.c
    branches/carve_booleans/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/carve_booleans/source/blender/editors/sculpt_paint/paint_utils.c
    branches/carve_booleans/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/carve_booleans/source/blender/editors/sculpt_paint/sculpt.c
    branches/carve_booleans/source/blender/editors/space_action/action_ops.c
    branches/carve_booleans/source/blender/editors/space_buttons/space_buttons.c
    branches/carve_booleans/source/blender/editors/space_clip/clip_draw.c
    branches/carve_booleans/source/blender/editors/space_clip/clip_editor.c
    branches/carve_booleans/source/blender/editors/space_console/console_ops.c
    branches/carve_booleans/source/blender/editors/space_graph/graph_ops.c
    branches/carve_booleans/source/blender/editors/space_image/image_ops.c
    branches/carve_booleans/source/blender/editors/space_nla/nla_ops.c
    branches/carve_booleans/source/blender/editors/space_node/node_ops.c
    branches/carve_booleans/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/carve_booleans/source/blender/editors/space_sequencer/sequencer_scopes.c
    branches/carve_booleans/source/blender/editors/space_view3d/space_view3d.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_edit.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_ops.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_view.c
    branches/carve_booleans/source/blender/makesdna/DNA_brush_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_dynamicpaint_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_image_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_meta_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_movieclip_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_object_force.h
    branches/carve_booleans/source/blender/makesdna/DNA_scene_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_sound_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_space_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_texture_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_userdef_types.h
    branches/carve_booleans/source/blender/makesrna/intern/rna_brush.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_fluidsim.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_main.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_scene.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_space.c
    branches/carve_booleans/source/blender/nodes/intern/node_common.c
    branches/carve_booleans/source/blender/python/intern/bpy_rna.c
    branches/carve_booleans/source/blender/render/intern/raytrace/rayobject.cpp
    branches/carve_booleans/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
    branches/carve_booleans/source/blender/render/intern/raytrace/rayobject_empty.cpp
    branches/carve_booleans/source/blender/render/intern/raytrace/rayobject_instance.cpp
    branches/carve_booleans/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/carve_booleans/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/carve_booleans/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/carve_booleans/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/carve_booleans/source/blender/render/intern/raytrace/vbvh.h
    branches/carve_booleans/source/blender/render/intern/source/shadeoutput.c
    branches/carve_booleans/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/carve_booleans/source/blender/windowmanager/intern/wm_operators.c
    branches/carve_booleans/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/carve_booleans/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/carve_booleans/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/carve_booleans/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/carve_booleans/source/gameengine/Expressions/PyObjectPlus.h
    branches/carve_booleans/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/carve_booleans/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/carve_booleans/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/carve_booleans/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/carve_booleans/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/carve_booleans/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/carve_booleans/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/carve_booleans/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/carve_booleans/source/gameengine/Rasterizer/RAS_TexVert.cpp

Property Changed:
----------------
    branches/carve_booleans/
    branches/carve_booleans/source/blender/editors/space_outliner/


Property changes on: branches/carve_booleans
___________________________________________________________________
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:40001-42622,42663-43368
   + /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:40001-42622,42663-43411

Modified: branches/carve_booleans/intern/cycles/blender/addon/__init__.py
===================================================================
--- branches/carve_booleans/intern/cycles/blender/addon/__init__.py	2012-01-16 06:57:37 UTC (rev 43411)
+++ branches/carve_booleans/intern/cycles/blender/addon/__init__.py	2012-01-16 07:32:38 UTC (rev 43412)
@@ -23,7 +23,6 @@
     "author": "",
     "version": (0, 0),
     "blender": (2, 6, 0),
-    "api": 41670,
     "location": "Info header, render engine menu",
     "description": "Cycles Render Engine integration.",
     "warning": "",

Modified: branches/carve_booleans/release/scripts/modules/addon_utils.py
===================================================================
--- branches/carve_booleans/release/scripts/modules/addon_utils.py	2012-01-16 06:57:37 UTC (rev 43411)
+++ branches/carve_booleans/release/scripts/modules/addon_utils.py	2012-01-16 07:32:38 UTC (rev 43412)
@@ -361,7 +361,6 @@
                                     "author": "",
                                     "version": (),
                                     "blender": (),
-                                    "api": 0,
                                     "location": "",
                                     "description": "",
                                     "wiki_url": "",

Modified: branches/carve_booleans/release/scripts/modules/animsys_refactor.py
===================================================================
--- branches/carve_booleans/release/scripts/modules/animsys_refactor.py	2012-01-16 06:57:37 UTC (rev 43411)
+++ branches/carve_booleans/release/scripts/modules/animsys_refactor.py	2012-01-16 07:32:38 UTC (rev 43412)
@@ -532,8 +532,6 @@
     ("ShaderNodeMapping", "minimum", "min"),
     ("ShaderNodeMapping", "clamp_maximum", "use_max"),
     ("ShaderNodeMapping", "clamp_minimum", "use_min"),
-    ("VertexPaint", "all_faces", "use_all_faces"),
-    ("VertexPaint", "spray", "use_spray"),
     ("ParticleEdit", "add_keys", "default_key_count"),
     ("ParticleEdit", "selection_mode", "select_mode"),
     ("ParticleEdit", "auto_velocity", "use_auto_velocity"),

Modified: branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_modifier.py	2012-01-16 06:57:37 UTC (rev 43411)
+++ branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_modifier.py	2012-01-16 07:32:38 UTC (rev 43412)
@@ -587,13 +587,12 @@
             layout.prop(md, "use_keep_above_surface")
 
     def SIMPLE_DEFORM(self, layout, ob, md):
+
+        layout.row().prop(md, "deform_method", expand=True)
+
         split = layout.split()
 
         col = split.column()
-        col.label(text="Mode:")
-        col.prop(md, "deform_method", text="")
-
-        col = split.column()
         col.label(text="Vertex Group:")
         col.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
 
@@ -610,7 +609,7 @@
         col.label(text="Deform:")
         col.prop(md, "factor")
         col.prop(md, "limits", slider=True)
-        if md.deform_method in {'TAPER', 'STRETCH'}:
+        if md.deform_method in {'TAPER', 'STRETCH', 'TWIST'}:
             col.prop(md, "lock_x")
             col.prop(md, "lock_y")
 

Modified: branches/carve_booleans/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/carve_booleans/release/scripts/startup/bl_ui/space_clip.py	2012-01-16 06:57:37 UTC (rev 43411)
+++ branches/carve_booleans/release/scripts/startup/bl_ui/space_clip.py	2012-01-16 07:32:38 UTC (rev 43412)
@@ -515,6 +515,17 @@
         layout = self.layout
         sc = context.space_data
 
+        row = layout.row(align=True)
+        sub = row.row()
+        sub.prop(sc, "show_red_channel", text="R", toggle=True)
+        sub.prop(sc, "show_green_channel", text="G", toggle=True)
+        sub.prop(sc, "show_blue_channel", text="B", toggle=True)
+
+        row.separator()
+
+        sub = row.row()
+        sub.prop(sc, "use_grayscale_preview", text="B/W", toggle=True)
+
         col = layout.column(align=True)
 
         col.prop(sc, "show_marker_pattern", text="Pattern")

Modified: branches/carve_booleans/release/scripts/startup/bl_ui/space_dopesheet.py
===================================================================
--- branches/carve_booleans/release/scripts/startup/bl_ui/space_dopesheet.py	2012-01-16 06:57:37 UTC (rev 43411)
+++ branches/carve_booleans/release/scripts/startup/bl_ui/space_dopesheet.py	2012-01-16 07:32:38 UTC (rev 43412)
@@ -152,10 +152,7 @@
         layout.prop(st, "use_auto_merge_keyframes")
         layout.prop(st, "use_marker_sync")
 
-        if st.show_seconds:
-            layout.operator("anim.time_toggle", text="Show Frames")
-        else:
-            layout.operator("anim.time_toggle", text="Show Seconds")
+        layout.prop(st, "show_seconds")
 
         layout.separator()
         layout.operator("anim.previewrange_set")

Modified: branches/carve_booleans/release/scripts/startup/bl_ui/space_graph.py
===================================================================
--- branches/carve_booleans/release/scripts/startup/bl_ui/space_graph.py	2012-01-16 06:57:37 UTC (rev 43411)
+++ branches/carve_booleans/release/scripts/startup/bl_ui/space_graph.py	2012-01-16 07:32:38 UTC (rev 43412)
@@ -81,14 +81,14 @@
         layout.prop(st, "use_beauty_drawing")
 
         layout.separator()
-        if st.show_handles:
-            layout.operator("graph.handles_view_toggle", icon='CHECKBOX_HLT', text="Show All Handles")
-        else:
-            layout.operator("graph.handles_view_toggle", icon='CHECKBOX_DEHLT', text="Show All Handles")
+
+        layout.prop(st, "show_handles")
+
         layout.prop(st, "use_only_selected_curves_handles")
         layout.prop(st, "use_only_selected_keyframe_handles")
-        layout.operator("anim.time_toggle")
 
+        layout.prop(st, "show_seconds")
+
         layout.separator()
         layout.operator("anim.previewrange_set")
         layout.operator("anim.previewrange_clear")

Modified: branches/carve_booleans/release/scripts/startup/bl_ui/space_nla.py
===================================================================
--- branches/carve_booleans/release/scripts/startup/bl_ui/space_nla.py	2012-01-16 06:57:37 UTC (rev 43411)
+++ branches/carve_booleans/release/scripts/startup/bl_ui/space_nla.py	2012-01-16 07:32:38 UTC (rev 43412)
@@ -62,7 +62,7 @@
         layout.prop(st, "use_realtime_update")
         layout.prop(st, "show_frame_indicator")
 
-        layout.operator("anim.time_toggle", text="Show Frames" if st.show_seconds else "Show Seconds")
+        layout.prop(st, "show_seconds")
 
         layout.prop(st, "show_strip_curves")
 

Modified: branches/carve_booleans/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- branches/carve_booleans/release/scripts/startup/bl_ui/space_sequencer.py	2012-01-16 06:57:37 UTC (rev 43411)
+++ branches/carve_booleans/release/scripts/startup/bl_ui/space_sequencer.py	2012-01-16 07:32:38 UTC (rev 43412)
@@ -114,10 +114,7 @@
 
         layout.operator("sequencer.view_selected")
 
-        if st.show_frames:
-            layout.operator("anim.time_toggle", text="Show Seconds")
-        else:
-            layout.operator("anim.time_toggle", text="Show Frames")
+        layout.prop(st, "show_seconds")
 
         layout.prop(st, "show_frame_indicator")
         if st.display_mode == 'IMAGE':

Modified: branches/carve_booleans/release/scripts/startup/bl_ui/space_time.py
===================================================================
--- branches/carve_booleans/release/scripts/startup/bl_ui/space_time.py	2012-01-16 06:57:37 UTC (rev 43411)
+++ branches/carve_booleans/release/scripts/startup/bl_ui/space_time.py	2012-01-16 07:32:38 UTC (rev 43412)
@@ -109,7 +109,7 @@
 
         st = context.space_data
 
-        layout.operator("anim.time_toggle")
+        layout.prop(st, "show_seconds")
         layout.operator("time.view_all")
 
         layout.separator()

Modified: branches/carve_booleans/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/carve_booleans/release/scripts/startup/bl_ui/space_view3d.py	2012-01-16 06:57:37 UTC (rev 43411)
+++ branches/carve_booleans/release/scripts/startup/bl_ui/space_view3d.py	2012-01-16 07:32:38 UTC (rev 43412)
@@ -646,8 +646,8 @@
 
         layout.separator()
 
-        layout.operator("armature.select_all", text="Select/Deselect All")
-        layout.operator("armature.select_inverse", text="Inverse")
+        layout.operator("armature.select_all", text="Select/Deselect All").action = 'TOGGLE'
+        layout.operator("armature.select_all", text="Inverse").action = 'INVERT'
 
         layout.separator()
 

Modified: branches/carve_booleans/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/carve_booleans/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2012-01-16 06:57:37 UTC (rev 43411)
+++ branches/carve_booleans/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2012-01-16 07:32:38 UTC (rev 43412)
@@ -476,16 +476,16 @@
         parent.prop(ups, "use_unified_strength", text="Strength")
 
     @staticmethod
-    def prop_unified_size(parent, context, brush, prop_name, icon='NONE', text=""):

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list