[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29039] branches/soc-2010-jwilkins: merged with head
Jason Wilkins
Jason.A.Wilkins at gmail.com
Fri May 28 04:25:53 CEST 2010
Revision: 29039
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29039
Author: jwilkins
Date: 2010-05-28 04:25:50 +0200 (Fri, 28 May 2010)
Log Message:
-----------
merged with head
Modified Paths:
--------------
branches/soc-2010-jwilkins/CMakeLists.txt
branches/soc-2010-jwilkins/SConstruct
branches/soc-2010-jwilkins/release/datafiles/blenderbuttons
branches/soc-2010-jwilkins/release/scripts/modules/bpy_types.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_object.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d.py
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/cloth.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/collision.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/constraint.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/customdata.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/image.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/implicit.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/node.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/object.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/sca.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/threads.c
branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
branches/soc-2010-jwilkins/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2010-jwilkins/source/blender/editors/include/UI_interface.h
branches/soc-2010-jwilkins/source/blender/editors/interface/interface.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_intern.h
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_templates.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_widgets.c
branches/soc-2010-jwilkins/source/blender/editors/interface/resources.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_bake.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_constraint.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_intern.h
branches/soc-2010-jwilkins/source/blender/editors/object/object_ops.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_select.c
branches/soc-2010-jwilkins/source/blender/editors/physics/physics_fluid.c
branches/soc-2010-jwilkins/source/blender/editors/render/render_internal.c
branches/soc-2010-jwilkins/source/blender/editors/render/render_preview.c
branches/soc-2010-jwilkins/source/blender/editors/screen/screendump.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/filelist.c
branches/soc-2010-jwilkins/source/blender/editors/space_info/space_info.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_edit.c
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_node_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-jwilkins/source/blender/makesrna/RNA_access.h
branches/soc-2010-jwilkins/source/blender/makesrna/intern/SConscript
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
branches/soc-2010-jwilkins/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2010-jwilkins/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2010-jwilkins/source/blender/render/intern/include/render_types.h
branches/soc-2010-jwilkins/source/blender/render/intern/source/imagetexture.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/pipeline.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/rendercore.c
branches/soc-2010-jwilkins/source/blender/windowmanager/WM_api.h
branches/soc-2010-jwilkins/source/blender/windowmanager/WM_types.h
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2010-jwilkins/source/creator/creator.c
branches/soc-2010-jwilkins/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ModifierDeformer.h
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2010-jwilkins/source/nan_definitions.mk
Modified: branches/soc-2010-jwilkins/CMakeLists.txt
===================================================================
--- branches/soc-2010-jwilkins/CMakeLists.txt 2010-05-27 23:17:16 UTC (rev 29038)
+++ branches/soc-2010-jwilkins/CMakeLists.txt 2010-05-28 02:25:50 UTC (rev 29039)
@@ -92,7 +92,7 @@
OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF)
ELSE()
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
- OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" ON)
+ OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF)
ENDIF()
IF (APPLE)
@@ -416,7 +416,7 @@
SET(TIFF ${LIBDIR}/tiff)
SET(TIFF_INCLUDE_DIR ${TIFF}/include)
- SET(TIFF_LIBRARY tiff)
+ SET(TIFF_LIBRARY libtiff)
SET(TIFF_LIBPATH ${TIFF}/lib)
SET(WINTAB_INC ${LIBDIR}/wintab/include)
Modified: branches/soc-2010-jwilkins/SConstruct
===================================================================
--- branches/soc-2010-jwilkins/SConstruct 2010-05-27 23:17:16 UTC (rev 29038)
+++ branches/soc-2010-jwilkins/SConstruct 2010-05-28 02:25:50 UTC (rev 29039)
@@ -569,9 +569,9 @@
#currently win64-vc doesn't appear to have libpng.dll
if env['OURPLATFORM'] != 'win64-vc':
- dllsources += ['${BF_PNG_LIBPATH}/libpng.dll',
- '${BF_ZLIB_LIBPATH}/zlib.dll']
+ dllsources += ['${BF_PNG_LIBPATH}/libpng.dll']
+ dllsources += ['${BF_ZLIB_LIBPATH}/zlib.dll']
# Used when linking to libtiff was dynamic
# keep it here until compilation on all platform would be ok
# dllsources += ['${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
Modified: branches/soc-2010-jwilkins/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)
Modified: branches/soc-2010-jwilkins/release/scripts/modules/bpy_types.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/modules/bpy_types.py 2010-05-27 23:17:16 UTC (rev 29038)
+++ branches/soc-2010-jwilkins/release/scripts/modules/bpy_types.py 2010-05-28 02:25:50 UTC (rev 29039)
@@ -38,6 +38,16 @@
return new_context
+class Group(bpy_types.ID):
+ __slots__ = ()
+
+ @property
+ def users_dupli_object(self):
+ """The dupli group this group is used in, XXX, TODO, WHY DOESNT THIS WORK???"""
+ import bpy
+ return tuple(obj for obj in bpy.data.objects if self == obj.dupli_object)
+
+
class Object(bpy_types.ID):
__slots__ = ()
@@ -48,18 +58,16 @@
return tuple(child for child in bpy.data.objects if child.parent == self)
@property
- def group_users(self):
+ def users_group(self):
"""The groups this object is in"""
import bpy
- name = self.name
- return tuple(group for group in bpy.data.groups if name in group.objects)
+ return tuple(group for group in bpy.data.groups if self in group.objects[:])
@property
- def scene_users(self):
+ def users_scene(self):
"""The scenes this object is in"""
import bpy
- name = self.name
- return tuple(scene for scene in bpy.data.scenes if name in scene.objects)
+ return tuple(scene for scene in bpy.data.scenes if self in scene.objects[:])
class _GenericBone:
Modified: branches/soc-2010-jwilkins/release/scripts/ui/properties_object.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/properties_object.py 2010-05-27 23:17:16 UTC (rev 29038)
+++ branches/soc-2010-jwilkins/release/scripts/ui/properties_object.py 2010-05-28 02:25:50 UTC (rev 29039)
@@ -182,7 +182,7 @@
col.prop(group, "dupli_offset", text="")
prop = col.operator("wm.context_set_value", text="From Cursor")
- prop.path = "object.group_users[%d].dupli_offset" % index
+ prop.path = "object.users_group[%d].dupli_offset" % index
prop.value = value
index += 1
Modified: branches/soc-2010-jwilkins/release/scripts/ui/properties_object_constraint.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/properties_object_constraint.py 2010-05-27 23:17:16 UTC (rev 29038)
+++ branches/soc-2010-jwilkins/release/scripts/ui/properties_object_constraint.py 2010-05-28 02:25:50 UTC (rev 29039)
@@ -76,7 +76,7 @@
else:
layout.prop_object(con, "subtarget", con.target.data, "bones", text="")
- if con.type in ('COPY_LOCATION', 'STRETCH_TO', 'TRACK_TO'):
+ if con.type in ('COPY_LOCATION', 'STRETCH_TO', 'TRACK_TO', 'PIVOT'):
row = layout.row()
row.label(text="Head/Tail:")
row.prop(con, "head_tail", text="")
@@ -730,7 +730,23 @@
col.prop(con, "xz_scaling_mode", text="")
col.prop(con, "use_curve_radius")
+ def PIVOT(self, context, layout, con, wide_ui):
+ self.target_template(layout, con, wide_ui)
+ if con.target:
+ col = layout.column()
+ col.prop(con, "offset", text="Pivot Offset")
+ else:
+ col = layout.column()
+ col.prop(con, "use_relative_position")
+ if con.use_relative_position:
+ col.prop(con, "offset", text="Relative Pivot Point")
+ else:
+ col.prop(con, "offset", text="Absolute Pivot Point")
+
+ col = layout.column()
+ col.prop(con, "enabled_rotation_range", text="Pivot When")
+
class OBJECT_PT_constraints(ConstraintButtonsPanel):
bl_label = "Object Constraints"
bl_context = "constraint"
Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py 2010-05-27 23:17:16 UTC (rev 29038)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py 2010-05-28 02:25:50 UTC (rev 29039)
@@ -554,6 +554,10 @@
ui = theme.user_interface.wcol_scroll
col.label(text="Scroll Bar:")
ui_items_general(col, ui)
+
+ ui = theme.user_interface.wcol_progress
+ col.label(text="Progress Bar:")
+ ui_items_general(col, ui)
ui = theme.user_interface.wcol_list_item
col.label(text="List Item:")
Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_view3d.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d.py 2010-05-27 23:17:16 UTC (rev 29038)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d.py 2010-05-28 02:25:50 UTC (rev 29039)
@@ -796,6 +796,7 @@
layout = self.layout
layout.operator("object.constraint_add_with_targets")
+ layout.operator("object.constraints_copy")
layout.operator("object.constraints_clear")
@@ -1148,6 +1149,7 @@
layout = self.layout
layout.operator("pose.constraint_add_with_targets", text="Add (With Targets)...")
+ layout.operator("pose.constraints_copy")
layout.operator("pose.constraints_clear")
Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim.c 2010-05-27 23:17:16 UTC (rev 29038)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim.c 2010-05-28 02:25:50 UTC (rev 29039)
@@ -52,6 +52,7 @@
#include "BKE_anim.h"
#include "BKE_curve.h"
#include "BKE_DerivedMesh.h"
+#include "BKE_depsgraph.h"
#include "BKE_font.h"
#include "BKE_group.h"
#include "BKE_global.h"
Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/cloth.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/cloth.c 2010-05-27 23:17:16 UTC (rev 29038)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/cloth.c 2010-05-28 02:25:50 UTC (rev 29039)
@@ -27,17 +27,14 @@
#include "MEM_guardedalloc.h"
-#include "BKE_cloth.h"
-
#include "BKE_cdderivedmesh.h"
+#include "BKE_cloth.h"
#include "BKE_effect.h"
#include "BKE_global.h"
#include "BKE_modifier.h"
+#include "BKE_pointcache.h"
#include "BKE_utildefines.h"
-#include "BKE_pointcache.h"
-
-
#ifdef _WIN32
void tstart ( void )
{}
Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/collision.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/collision.c 2010-05-27 23:17:16 UTC (rev 29038)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/collision.c 2010-05-28 02:25:50 UTC (rev 29039)
@@ -59,7 +59,7 @@
/* step is limited from 0 (frame start position) to 1 (frame end position) */
void collision_move_object ( CollisionModifierData *collmd, float step, float prevstep )
{
- float tv[3] = {0,0,0};
+ float tv[3] = {0, 0, 0};
unsigned int i = 0;
for ( i = 0; i < collmd->numverts; i++ )
@@ -69,6 +69,7 @@
VECADDS ( collmd->current_xnew[i].co, collmd->x[i].co, tv, step );
VECSUB ( collmd->current_v[i].co, collmd->current_xnew[i].co, collmd->current_x[i].co );
}
+
bvhtree_update_from_mvert ( collmd->bvhtree, collmd->mfaces, collmd->numfaces, collmd->current_x, collmd->current_xnew, collmd->numverts, 1 );
}
@@ -527,7 +528,7 @@
float magtangent = 0, repulse = 0, d = 0;
double impulse = 0.0;
float vrel_t_pre[3];
- float temp[3];
+ float temp[3], spf;
// calculate tangential velocity
VECCOPY ( temp, collpair->normal );
@@ -565,10 +566,12 @@
// Apply repulse impulse if distance too short
// I_r = -min(dt*kd, m(0,1d/dt - v_n))
+ spf = (float)clmd->sim_parms->stepsPerFrame / clmd->sim_parms->timescale;
+
d = clmd->coll_parms->epsilon*8.0/9.0 + epsilon2*8.0/9.0 - collpair->distance;
- if ( ( magrelVel < 0.1*d*clmd->sim_parms->stepsPerFrame ) && ( d > ALMOST_ZERO ) )
+ if ( ( magrelVel < 0.1*d*spf ) && ( d > ALMOST_ZERO ) )
{
- repulse = MIN2 ( d*1.0/clmd->sim_parms->stepsPerFrame, 0.1*d*clmd->sim_parms->stepsPerFrame - magrelVel );
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list