[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37307] branches/soc-2010-nicks: svn merge -r 37212:37306 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Benoit Bolsee benoit.bolsee at online.be
Tue Jun 7 23:20:26 CEST 2011


Revision: 37307
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37307
Author:   ben2610
Date:     2011-06-07 21:20:25 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
svn merge -r 37212:37306 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/soc-2010-nicks/GNUmakefile
    branches/soc-2010-nicks/build_files/scons/config/win32-vc-config.py
    branches/soc-2010-nicks/release/scripts/startup/bl_operators/presets.py
    branches/soc-2010-nicks/release/scripts/startup/bl_operators/wm.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/space_text.py
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_brush.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_deform.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_multires.h
    branches/soc-2010-nicks/source/blender/blenkernel/intern/brush.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/customdata.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/deform.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/multires.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/object.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2010-nicks/source/blender/blenlib/BLI_math_geom.h
    branches/soc-2010-nicks/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2010-nicks/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2010-nicks/source/blender/blenlib/intern/math_geom.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/path_util.c
    branches/soc-2010-nicks/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-nicks/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2010-nicks/source/blender/editors/animation/anim_markers.c
    branches/soc-2010-nicks/source/blender/editors/animation/anim_ops.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/startup.blend.c
    branches/soc-2010-nicks/source/blender/editors/include/ED_mesh.h
    branches/soc-2010-nicks/source/blender/editors/include/ED_screen.h
    branches/soc-2010-nicks/source/blender/editors/interface/interface.c
    branches/soc-2010-nicks/source/blender/editors/interface/interface_draw.c
    branches/soc-2010-nicks/source/blender/editors/interface/interface_intern.h
    branches/soc-2010-nicks/source/blender/editors/interface/interface_layout.c
    branches/soc-2010-nicks/source/blender/editors/interface/interface_widgets.c
    branches/soc-2010-nicks/source/blender/editors/interface/resources.c
    branches/soc-2010-nicks/source/blender/editors/interface/view2d_ops.c
    branches/soc-2010-nicks/source/blender/editors/mesh/editmesh_loop.c
    branches/soc-2010-nicks/source/blender/editors/object/object_bake.c
    branches/soc-2010-nicks/source/blender/editors/object/object_shapekey.c
    branches/soc-2010-nicks/source/blender/editors/object/object_vgroup.c
    branches/soc-2010-nicks/source/blender/editors/render/render_view.c
    branches/soc-2010-nicks/source/blender/editors/screen/area.c
    branches/soc-2010-nicks/source/blender/editors/screen/screen_edit.c
    branches/soc-2010-nicks/source/blender/editors/screen/screen_ops.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2010-nicks/source/blender/editors/space_action/action_select.c
    branches/soc-2010-nicks/source/blender/editors/space_file/file_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_file/filesel.c
    branches/soc-2010-nicks/source/blender/editors/space_graph/graph_select.c
    branches/soc-2010-nicks/source/blender/editors/space_image/image_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_info/info_report.c
    branches/soc-2010-nicks/source/blender/editors/space_logic/logic_buttons.c
    branches/soc-2010-nicks/source/blender/editors/space_nla/nla_select.c
    branches/soc-2010-nicks/source/blender/editors/space_node/node_edit.c
    branches/soc-2010-nicks/source/blender/editors/space_node/node_select.c
    branches/soc-2010-nicks/source/blender/editors/space_outliner/outliner.c
    branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2010-nicks/source/blender/editors/transform/transform.c
    branches/soc-2010-nicks/source/blender/editors/transform/transform_conversions.c
    branches/soc-2010-nicks/source/blender/editors/util/undo.c
    branches/soc-2010-nicks/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2010-nicks/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2010-nicks/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2010-nicks/source/blender/imbuf/intern/divers.c
    branches/soc-2010-nicks/source/blender/imbuf/intern/filter.c
    branches/soc-2010-nicks/source/blender/makesdna/DNA_lattice_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2010-nicks/source/blender/makesrna/RNA_access.h
    branches/soc-2010-nicks/source/blender/makesrna/RNA_define.h
    branches/soc-2010-nicks/source/blender/makesrna/RNA_types.h
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_access.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_define.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2010-nicks/source/blender/nodes/intern/CMP_nodes/CMP_math.c
    branches/soc-2010-nicks/source/blender/python/intern/bpy_props.c
    branches/soc-2010-nicks/source/blender/python/intern/bpy_rna.c
    branches/soc-2010-nicks/source/blender/python/intern/bpy_rna.h
    branches/soc-2010-nicks/source/blender/render/intern/source/rendercore.c
    branches/soc-2010-nicks/source/blender/render/intern/source/volumetric.c
    branches/soc-2010-nicks/source/blender/windowmanager/WM_api.h
    branches/soc-2010-nicks/source/blender/windowmanager/WM_types.h
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_operators.c

Property Changed:
----------------
    branches/soc-2010-nicks/
    branches/soc-2010-nicks/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2010-nicks/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2010-nicks/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_world.py
    branches/soc-2010-nicks/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2010-nicks/source/blender/editors/render/render_update.c
    branches/soc-2010-nicks/source/blender/editors/uvedit/uvedit_buttons.c
    branches/soc-2010-nicks/source/blender/python/generic/


Property changes on: branches/soc-2010-nicks
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:34794-37212
   + /trunk/blender:34794-37306

Modified: branches/soc-2010-nicks/GNUmakefile
===================================================================
--- branches/soc-2010-nicks/GNUmakefile	2011-06-07 20:34:23 UTC (rev 37306)
+++ branches/soc-2010-nicks/GNUmakefile	2011-06-07 21:20:25 UTC (rev 37307)
@@ -64,21 +64,19 @@
 
 # Build Blender
 all:
-	@echo 
+	@echo
 	@echo Configuring Blender ...
 
 	if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
-		mkdir -p $(BUILD_DIR) ; \
-		cd $(BUILD_DIR) ; \
-		cmake $(BLENDER_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
+		cmake -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
 	fi
 
-	@echo 
+	@echo
 	@echo Building Blender ...
-	cd $(BUILD_DIR) ; make -s -j $(NPROCS) install
-	@echo 
+	make -C $(BUILD_DIR) -s -j $(NPROCS) install
+	@echo
 	@echo run blender from "$(BUILD_DIR)/bin/blender"
-	@echo 
+	@echo
 
 debug: all
 	# pass
@@ -91,7 +89,7 @@
 	cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot
 
 package_archive:
-	cd $(BUILD_DIR) ; make -s package_archive
+	make -C $(BUILD_DIR) -s package_archive
 	@echo archive in "$(BUILD_DIR)/release"
 
 # forward build targets
@@ -109,6 +107,6 @@
 	@echo "written: test_cmake_consistency.log"
 
 clean:
-	cd $(BUILD_DIR) ; make clean
+	make -C $(BUILD_DIR) clean
 
 .PHONY: all

Modified: branches/soc-2010-nicks/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2010-nicks/build_files/scons/config/win32-vc-config.py	2011-06-07 20:34:23 UTC (rev 37306)
+++ branches/soc-2010-nicks/build_files/scons/config/win32-vc-config.py	2011-06-07 21:20:25 UTC (rev 37307)
@@ -35,7 +35,7 @@
 
 WITH_BF_JACK = False
 BF_JACK = LIBDIR + '/jack'
-BF_JACK_INC = '${BF_JACK}/include'
+BF_JACK_INC = '${BF_JACK}/include ${BF_FFMPEG}/include/msvc'
 BF_JACK_LIB = 'libjack'
 BF_JACK_LIBPATH = '${BF_JACK}/lib'
 


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36570-37212
   + /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36570-37306

Modified: branches/soc-2010-nicks/release/scripts/startup/bl_operators/presets.py
===================================================================
--- branches/soc-2010-nicks/release/scripts/startup/bl_operators/presets.py	2011-06-07 20:34:23 UTC (rev 37306)
+++ branches/soc-2010-nicks/release/scripts/startup/bl_operators/presets.py	2011-06-07 21:20:25 UTC (rev 37307)
@@ -326,7 +326,7 @@
 
         ret = []
         for prop_id, prop in operator_rna.properties.items():
-            if (not prop.is_hidden) and prop_id not in properties_blacklist:
+            if (not (prop.is_hidden or prop.is_skip_save)) and prop_id not in properties_blacklist:
                 ret.append("op.%s" % prop_id)
 
         return ret


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36570-37212
   + /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36570-37306


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36570-37212
   + /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36570-37306

Modified: branches/soc-2010-nicks/release/scripts/startup/bl_operators/wm.py
===================================================================
--- branches/soc-2010-nicks/release/scripts/startup/bl_operators/wm.py	2011-06-07 20:34:23 UTC (rev 37306)
+++ branches/soc-2010-nicks/release/scripts/startup/bl_operators/wm.py	2011-06-07 21:20:25 UTC (rev 37307)
@@ -106,7 +106,7 @@
     '''Set a context value.'''
     bl_idname = "wm.context_set_boolean"
     bl_label = "Context Set Boolean"
-    bl_options = {'UNDO'}
+    bl_options = {'UNDO', 'INTERNAL'}
 
     data_path = rna_path_prop
     value = BoolProperty(name="Value",
@@ -119,7 +119,7 @@
     '''Set a context value.'''
     bl_idname = "wm.context_set_int"
     bl_label = "Context Set"
-    bl_options = {'UNDO'}
+    bl_options = {'UNDO', 'INTERNAL'}
 
     data_path = rna_path_prop
     value = IntProperty(name="Value", description="Assign value", default=0)
@@ -132,7 +132,7 @@
     '''Scale an int context value.'''
     bl_idname = "wm.context_scale_int"
     bl_label = "Context Set"
-    bl_options = {'UNDO'}
+    bl_options = {'UNDO', 'INTERNAL'}
 
     data_path = rna_path_prop
     value = FloatProperty(name="Value", description="Assign value", default=1.0)
@@ -168,7 +168,7 @@
     '''Set a context value.'''
     bl_idname = "wm.context_set_float"
     bl_label = "Context Set Float"
-    bl_options = {'UNDO'}
+    bl_options = {'UNDO', 'INTERNAL'}
 
     data_path = rna_path_prop
     value = FloatProperty(name="Value",
@@ -182,7 +182,7 @@
     '''Set a context value.'''
     bl_idname = "wm.context_set_string"
     bl_label = "Context Set String"
-    bl_options = {'UNDO'}
+    bl_options = {'UNDO', 'INTERNAL'}
 
     data_path = rna_path_prop
     value = StringProperty(name="Value",
@@ -195,7 +195,7 @@
     '''Set a context value.'''
     bl_idname = "wm.context_set_enum"
     bl_label = "Context Set Enum"
-    bl_options = {'UNDO'}
+    bl_options = {'UNDO', 'INTERNAL'}
 
     data_path = rna_path_prop
     value = StringProperty(name="Value",
@@ -209,7 +209,7 @@
     '''Set a context value.'''
     bl_idname = "wm.context_set_value"
     bl_label = "Context Set Value"
-    bl_options = {'UNDO'}
+    bl_options = {'UNDO', 'INTERNAL'}
 
     data_path = rna_path_prop
     value = StringProperty(name="Value",
@@ -227,7 +227,7 @@
     '''Toggle a context value.'''
     bl_idname = "wm.context_toggle"
     bl_label = "Context Toggle"
-    bl_options = {'UNDO'}
+    bl_options = {'UNDO', 'INTERNAL'}
 
     data_path = rna_path_prop
 
@@ -246,7 +246,7 @@
     '''Toggle a context value.'''
     bl_idname = "wm.context_toggle_enum"
     bl_label = "Context Toggle Values"
-    bl_options = {'UNDO'}
+    bl_options = {'UNDO', 'INTERNAL'}
 
     data_path = rna_path_prop
     value_1 = StringProperty(name="Value", \
@@ -273,7 +273,7 @@
     '''vertex keys, groups' etc.'''
     bl_idname = "wm.context_cycle_int"
     bl_label = "Context Int Cycle"
-    bl_options = {'UNDO'}
+    bl_options = {'UNDO', 'INTERNAL'}
 
     data_path = rna_path_prop
     reverse = rna_reverse_prop
@@ -307,7 +307,7 @@
     '''Toggle a context value.'''
     bl_idname = "wm.context_cycle_enum"
     bl_label = "Context Enum Cycle"
-    bl_options = {'UNDO'}
+    bl_options = {'UNDO', 'INTERNAL'}
 
     data_path = rna_path_prop
     reverse = rna_reverse_prop
@@ -360,7 +360,7 @@
     Useful for cycling the active mesh edit mode.'''
     bl_idname = "wm.context_cycle_array"
     bl_label = "Context Array Cycle"
-    bl_options = {'UNDO'}
+    bl_options = {'UNDO', 'INTERNAL'}
 
     data_path = rna_path_prop
     reverse = rna_reverse_prop
@@ -406,7 +406,7 @@
 class WM_OT_context_menu_enum(bpy.types.Operator):
     bl_idname = "wm.context_menu_enum"
     bl_label = "Context Enum Menu"
-    bl_options = {'UNDO'}
+    bl_options = {'UNDO', 'INTERNAL'}
     data_path = rna_path_prop
 
     def execute(self, context):
@@ -420,7 +420,7 @@
     '''Toggle a context value.'''
     bl_idname = "wm.context_set_id"
     bl_label = "Set Library ID"
-    bl_options = {'UNDO'}
+    bl_options = {'UNDO', 'INTERNAL'}
 
     data_path = rna_path_prop
     value = StringProperty(name="Value",
@@ -462,6 +462,7 @@
     '''Adjust arbitrary values with mouse input'''
     bl_idname = "wm.context_modal_mouse"
     bl_label = "Context Modal Mouse"
+    bl_options = {'INTERNAL'}
 
     data_path_iter = StringProperty(description="The data path relative to the context, must point to an iterable.")
     data_path_item = StringProperty(description="The data path from each iterable to the value (int or float)")


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36570-37212
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36570-37306


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36570-37212
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36570-37306


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36570-37212
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36570-37306


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36570-37212
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36570-37306


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36570-37212
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36570-37306


Property changes on: branches/soc-2010-nicks/release/scripts/startup/bl_ui/properties_data_lattice.py

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list