[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28601] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 28600.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Thu May 6 00:57:59 CEST 2010


Revision: 28601
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28601
Author:   kjym3
Date:     2010-05-06 00:57:58 +0200 (Thu, 06 May 2010)

Log Message:
-----------
Merged changes in the trunk up to revision 28600.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28600

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DropTargetWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
    branches/soc-2008-mxcurioni/release/datafiles/blenderbuttons
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/arm_biped.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/eye_balls.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/eye_lid.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/finger_curl.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/leg_biped.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/leg_quadruped.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/mouth.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/neck.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/neck_flex.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/palm_curl.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/shape_key_control.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/shape_key_distance.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/shape_key_rotdiff.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/spine_pivot_flex.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/tail_control.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/tongue.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rna_info.py
    branches/soc-2008-mxcurioni/release/scripts/op/console_python.py
    branches/soc-2008-mxcurioni/release/scripts/op/image.py
    branches/soc-2008-mxcurioni/release/scripts/op/sequencer.py
    branches/soc-2008-mxcurioni/release/scripts/op/vertexpaint_dirt.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_mesh.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_object.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_outliner.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_time.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref_keymap.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/pbvh.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/blenderbuttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_icons.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_group.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_constraints.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_controller_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sensor_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animviz.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_boid.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fluidsim.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_meta.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_property.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_smoke.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mask.c
    branches/soc-2008-mxcurioni/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2008-mxcurioni/source/blender/python/doc/sphinx_doc_gen.sh
    branches/soc-2008-mxcurioni/source/blender/python/generic/blf_api.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.h

Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DropTargetWin32.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DropTargetWin32.cpp	2010-05-05 21:25:34 UTC (rev 28600)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DropTargetWin32.cpp	2010-05-05 22:57:58 UTC (rev 28601)
@@ -110,8 +110,8 @@
  */
 HRESULT __stdcall GHOST_DropTargetWin32::DragEnter(IDataObject * pDataObject, DWORD grfKeyState, POINTL pt, DWORD * pdwEffect)
 {
-	// we don't know yet if we accept the drop.
-	m_window->setAcceptDragOperation(false);
+	// we accept all drop by default
+	m_window->setAcceptDragOperation(true);
 	*pdwEffect = DROPEFFECT_NONE;
 	
 	m_draggedObjectType = getGhostType(pDataObject);

Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm	2010-05-05 21:25:34 UTC (rev 28600)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm	2010-05-05 22:57:58 UTC (rev 28601)
@@ -167,7 +167,7 @@
 	else if ([[draggingPBoard types] containsObject:NSStringPboardType]) m_draggedObjectType = GHOST_kDragnDropTypeString;
 	else return NSDragOperationNone;
 	
-	associatedWindow->setAcceptDragOperation(FALSE); //Drag operation needs to be accepted explicitly by the event manager
+	associatedWindow->setAcceptDragOperation(TRUE); //Drag operation is accepted by default
 	systemCocoa->handleDraggingEvent(GHOST_kEventDraggingEntered, m_draggedObjectType, associatedWindow, mouseLocation.x, mouseLocation.y, nil);
 	return NSDragOperationCopy;
 }

Modified: branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h	2010-05-05 21:25:34 UTC (rev 28600)
+++ branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h	2010-05-05 22:57:58 UTC (rev 28601)
@@ -144,6 +144,12 @@
 	uintptr_t MEM_get_mapped_memory_in_use(void);
 	int MEM_get_memory_blocks_in_use(void);
 
+	/*reset the peak memory statistic to zero*/
+	void MEM_reset_peak_memory(void);
+
+	/*get the peak memory usage in bytes, including mmap allocations*/
+	uintptr_t MEM_get_peak_memory(void);
+
 #ifdef __cplusplus
 }
 #endif

Modified: branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c	2010-05-05 21:25:34 UTC (rev 28600)
+++ branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c	2010-05-05 22:57:58 UTC (rev 28601)
@@ -138,7 +138,7 @@
 	
 
 static volatile int totblock= 0;
-static volatile uintptr_t mem_in_use= 0, mmap_in_use= 0;
+static volatile uintptr_t mem_in_use= 0, mmap_in_use= 0, peak_mem = 0;
 
 static volatile struct localListBase _membase;
 static volatile struct localListBase *membase = &_membase;
@@ -293,6 +293,8 @@
 	
 	totblock++;
 	mem_in_use += len;
+
+	peak_mem = mem_in_use > peak_mem ? mem_in_use : peak_mem;
 }
 
 void *MEM_mallocN(size_t len, const char *str)
@@ -377,6 +379,7 @@
 		make_memhead_header(memh, len, str);
 		memh->mmap= 1;
 		mmap_in_use += len;
+		peak_mem = mmap_in_use > peak_mem ? mmap_in_use : peak_mem;
 		mem_unlock_thread();
 #ifdef DEBUG_MEMCOUNTER
 		if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
@@ -802,6 +805,24 @@
 	return(name);
 }
 
+uintptr_t MEM_get_peak_memory(void)
+{
+	uintptr_t _peak_mem;
+
+	mem_lock_thread();
+	_peak_mem = peak_mem;
+	mem_unlock_thread();
+
+	return _peak_mem;
+}
+
+void MEM_reset_peak_memory(void)
+{
+	mem_lock_thread();
+	peak_mem = 0;
+	mem_unlock_thread();
+}
+
 uintptr_t MEM_get_memory_in_use(void)
 {
 	uintptr_t _mem_in_use;

Modified: branches/soc-2008-mxcurioni/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)

Modified: branches/soc-2008-mxcurioni/release/scripts/modules/rigify/arm_biped.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/modules/rigify/arm_biped.py	2010-05-05 21:25:34 UTC (rev 28600)
+++ branches/soc-2008-mxcurioni/release/scripts/modules/rigify/arm_biped.py	2010-05-05 22:57:58 UTC (rev 28601)
@@ -192,7 +192,7 @@
 
     # shoulder is used as a hinge
     fk_chain.rename("shoulder", "MCH-%s_hinge" % base_names[mt.arm])
-    fk_chain.shoulder_e.translate(Vector(0.0, fk_chain.shoulder_e.length / 2, 0.0))
+    fk_chain.shoulder_e.translate(Vector((0.0, fk_chain.shoulder_e.length / 2, 0.0)))
 
     # upper arm constrains to this.
     ex.socket_e = copy_bone_simple(arm, mt.arm, "MCH-%s_socket" % base_names[mt.arm])
@@ -240,7 +240,7 @@
         con.name = "hinge"
         con.target = obj
         con.subtarget = mt.shoulder
-        driver_fcurve = con.driver_add("influence", 0)
+        driver_fcurve = con.driver_add("influence")
         driver = driver_fcurve.driver
 
 

Modified: branches/soc-2008-mxcurioni/release/scripts/modules/rigify/eye_balls.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/modules/rigify/eye_balls.py	2010-05-05 21:25:34 UTC (rev 28600)
+++ branches/soc-2008-mxcurioni/release/scripts/modules/rigify/eye_balls.py	2010-05-05 22:57:58 UTC (rev 28601)
@@ -57,7 +57,7 @@
             if driver_s.data_path == driver_path:
                 fcurve = driver_s
     if fcurve == None:
-        fcurve = obj.data.shape_keys.keys[name].driver_add("value", 0)
+        fcurve = obj.data.shape_keys.keys[name].driver_add("value")
         fcurve.driver.type = 'AVERAGE'
         new = True
 
@@ -217,7 +217,7 @@
         eyes += ["ORG-"+name]
 
     # Get the average position of the eyes
-    center = Vector(0,0,0)
+    center = Vector((0, 0, 0))
     for eye in eyes:
         center += eb[eye].head
     if len(eyes) != 0:
@@ -295,7 +295,7 @@
     con.target = obj
     con.subtarget = head
 
-    fcurve = con.driver_add("influence", 0)
+    fcurve = con.driver_add("influence")
     driver = fcurve.driver
     driver.type = 'AVERAGE'
     mod = fcurve.modifiers[0]

Modified: branches/soc-2008-mxcurioni/release/scripts/modules/rigify/eye_lid.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/modules/rigify/eye_lid.py	2010-05-05 21:25:34 UTC (rev 28600)
+++ branches/soc-2008-mxcurioni/release/scripts/modules/rigify/eye_lid.py	2010-05-05 22:57:58 UTC (rev 28601)
@@ -299,14 +299,15 @@
     lid8 = copy_bone_simple(obj.data, definitions[9], base_names[definitions[9]]).name
 
     size = eb[lid1].length
-    eb[lid1].tail = eb[lid1].head + Vector(0,size,0)
-    eb[lid2].tail = eb[lid2].head + Vector(0,size,0)
-    eb[lid3].tail = eb[lid3].head + Vector(0,size,0)
-    eb[lid4].tail = eb[lid4].head + Vector(0,size,0)
-    eb[lid5].tail = eb[lid5].head + Vector(0,size,0)
-    eb[lid6].tail = eb[lid6].head + Vector(0,size,0)
-    eb[lid7].tail = eb[lid7].head + Vector(0,size,0)
-    eb[lid8].tail = eb[lid8].head + Vector(0,size,0)
+    size_y = Vector(0.0, size, 0.0)
+    eb[lid1].tail = eb[lid1].head + size_y
+    eb[lid2].tail = eb[lid2].head + size_y
+    eb[lid3].tail = eb[lid3].head + size_y
+    eb[lid4].tail = eb[lid4].head + size_y
+    eb[lid5].tail = eb[lid5].head + size_y
+    eb[lid6].tail = eb[lid6].head + size_y
+    eb[lid7].tail = eb[lid7].head + size_y
+    eb[lid8].tail = eb[lid8].head + size_y
 
     eb[lid1].roll = 0
     eb[lid2].roll = 0
@@ -438,7 +439,7 @@
     con.minimum = -distance*2
     con.maximum = distance
     con.target_space = 'LOCAL'
-    fcurve = con.driver_add("influence", 0)
+    fcurve = con.driver_add("influence")
     driver = fcurve.driver
     driver.type = 'AVERAGE'
     var = driver.variables.new()
@@ -457,7 +458,7 @@
     con.minimum = -distance*2
     con.maximum = distance
     con.target_space = 'LOCAL'
-    fcurve = con.driver_add("influence", 0)
+    fcurve = con.driver_add("influence")
     driver = fcurve.driver
     driver.type = 'AVERAGE'
     var = driver.variables.new()
@@ -475,7 +476,7 @@
     con.minimum = -distance*2
     con.maximum = distance
     con.target_space = 'LOCAL'
-    fcurve = con.driver_add("influence", 0)
+    fcurve = con.driver_add("influence")
     driver = fcurve.driver
     driver.type = 'AVERAGE'
     var = driver.variables.new()
@@ -493,7 +494,7 @@
     con.minimum = -distance*2
     con.maximum = distance
     con.target_space = 'LOCAL'
-    fcurve = con.driver_add("influence", 0)
+    fcurve = con.driver_add("influence")
     driver = fcurve.driver
     driver.type = 'AVERAGE'
     var = driver.variables.new()
@@ -511,7 +512,7 @@
     con.minimum = -distance*2
     con.maximum = distance
     con.target_space = 'LOCAL'
-    fcurve = con.driver_add("influence", 0)
+    fcurve = con.driver_add("influence")
     driver = fcurve.driver
     driver.type = 'AVERAGE'
     var = driver.variables.new()
@@ -530,7 +531,7 @@
     con.minimum = -distance
     con.maximum = distance*2
     con.target_space = 'LOCAL'
-    fcurve = con.driver_add("influence", 0)
+    fcurve = con.driver_add("influence")
     driver = fcurve.driver
     driver.type = 'AVERAGE'
     var = driver.variables.new()
@@ -548,7 +549,7 @@
     con.minimum = -distance
     con.maximum = distance*2
     con.target_space = 'LOCAL'
-    fcurve = con.driver_add("influence", 0)
+    fcurve = con.driver_add("influence")
     driver = fcurve.driver
     driver.type = 'AVERAGE'
     var = driver.variables.new()
@@ -566,7 +567,7 @@
     con.minimum = -distance
     con.maximum = distance*2
     con.target_space = 'LOCAL'
-    fcurve = con.driver_add("influence", 0)
+    fcurve = con.driver_add("influence")
     driver = fcurve.driver
     driver.type = 'AVERAGE'
     var = driver.variables.new()
@@ -584,7 +585,7 @@
     con.minimum = -distance
     con.maximum = distance*2
     con.target_space = 'LOCAL'
-    fcurve = con.driver_add("influence", 0)
+    fcurve = con.driver_add("influence")
     driver = fcurve.driver
     driver.type = 'AVERAGE'
     var = driver.variables.new()
@@ -602,7 +603,7 @@
     con.minimum = -distance
     con.maximum = distance*2
     con.target_space = 'LOCAL'
-    fcurve = con.driver_add("influence", 0)
+    fcurve = con.driver_add("influence")
     driver = fcurve.driver

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list