[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44517] branches/hive: merged with Blender 2.62
Sjoerd de Vries
sjdv1982 at gmail.com
Tue Feb 28 16:28:47 CET 2012
Revision: 44517
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44517
Author: sjoerddevries
Date: 2012-02-28 15:28:41 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
merged with Blender 2.62
Modified Paths:
--------------
branches/hive/extern/SConscript
branches/hive/extern/bullet2/src/LinearMath/btScalar.h
branches/hive/extern/eltopo/common/bfstream.h
branches/hive/release/scripts/modules/bpy_types.py
branches/hive/release/scripts/startup/bl_ui/properties_data_armature.py
branches/hive/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/hive/source/blender/gpu/intern/gpu_shader_material.glsl
branches/hive/source/blender/makesrna/SConscript
branches/hive/source/blender/makesrna/intern/CMakeLists.txt
branches/hive/source/blender/makesrna/intern/SConscript
branches/hive/source/blender/python/SConscript
branches/hive/source/blender/render/intern/include/volumetric.h
branches/hive/source/blender/render/intern/source/shadbuf.c
branches/hive/source/gameengine/Converter/SConscript
branches/hive/source/gameengine/Expressions/ListValue.cpp
branches/hive/source/gameengine/Expressions/Value.cpp
branches/hive/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/hive/source/gameengine/Ketsji/CMakeLists.txt
branches/hive/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/hive/source/gameengine/Ketsji/KX_PythonInit.h
branches/hive/source/gameengine/Ketsji/KX_PythonMain.cpp
branches/hive/source/gameengine/Ketsji/SConscript
Removed Paths:
-------------
branches/hive/release/datafiles/blenderbuttons
branches/hive/release/scripts/startup/bl_operators/animsys_update.py
branches/hive/release/scripts/startup/bl_operators/nla.py
Modified: branches/hive/extern/SConscript
===================================================================
--- branches/hive/extern/SConscript 2012-02-28 14:05:00 UTC (rev 44516)
+++ branches/hive/extern/SConscript 2012-02-28 15:28:41 UTC (rev 44517)
@@ -5,6 +5,9 @@
SConscript(['glew/SConscript'])
SConscript(['colamd/SConscript'])
+if env['WITH_BF_GAMEENGINE']:
+ SConscript(['recastnavigation/SConscript'])
+
if env['WITH_BF_ELTOPO']:
SConscript(['eltopo/SConscript'])
Modified: branches/hive/extern/bullet2/src/LinearMath/btScalar.h
===================================================================
--- branches/hive/extern/bullet2/src/LinearMath/btScalar.h 2012-02-28 14:05:00 UTC (rev 44516)
+++ branches/hive/extern/bullet2/src/LinearMath/btScalar.h 2012-02-28 15:28:41 UTC (rev 44517)
@@ -29,7 +29,7 @@
#include <cfloat>
#include <float.h>
-/* SVN $Revision$ on $Date$ from http://bullet.googlecode.com*/
+/* SVN $Revision: 35500 $ on $Date: 2011-03-12 21:34:17 +0100 (Sat, 12 Mar 2011) $ from http://bullet.googlecode.com*/
#define BT_BULLET_VERSION 278
inline int btGetVersion()
Modified: branches/hive/extern/eltopo/common/bfstream.h
===================================================================
--- branches/hive/extern/eltopo/common/bfstream.h 2012-02-28 14:05:00 UTC (rev 44516)
+++ branches/hive/extern/eltopo/common/bfstream.h 2012-02-28 15:28:41 UTC (rev 44517)
@@ -6,7 +6,16 @@
#include <cstdlib>
#include <fstream>
+// __BIG_ENDIAN__ or __LITTLE_ENDIAN__ should be defined before the compiler gets here
+// true in gcc 4.2 but may not be guarenteed between compilers/versions ??
+
+// list taken from source/blender/blenkernel/BKE_utildefines.h
+#if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
+#define __BIG_ENDIAN__
+#else
#define __LITTLE_ENDIAN__
+#endif
+
#ifdef __BIG_ENDIAN__
#ifdef __LITTLE_ENDIAN__
#error Cannot be both big and little endian
Deleted: branches/hive/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)
Modified: branches/hive/release/scripts/modules/bpy_types.py
===================================================================
--- branches/hive/release/scripts/modules/bpy_types.py 2012-02-28 14:05:00 UTC (rev 44516)
+++ branches/hive/release/scripts/modules/bpy_types.py 2012-02-28 15:28:41 UTC (rev 44517)
@@ -399,7 +399,7 @@
@property
def edge_keys(self):
- return [edge_key for face in self.faces for edge_key in face.edge_keys]
+ return [ed.key for ed in self.edges]
class MeshEdge(StructRNA):
@@ -419,19 +419,33 @@
face_verts = self.vertices[:]
mesh_verts = self.id_data.vertices
if len(face_verts) == 3:
- return (mesh_verts[face_verts[0]].co + mesh_verts[face_verts[1]].co + mesh_verts[face_verts[2]].co) / 3.0
+ return (mesh_verts[face_verts[0]].co +
+ mesh_verts[face_verts[1]].co +
+ mesh_verts[face_verts[2]].co
+ ) / 3.0
else:
- return (mesh_verts[face_verts[0]].co + mesh_verts[face_verts[1]].co + mesh_verts[face_verts[2]].co + mesh_verts[face_verts[3]].co) / 4.0
+ return (mesh_verts[face_verts[0]].co +
+ mesh_verts[face_verts[1]].co +
+ mesh_verts[face_verts[2]].co +
+ mesh_verts[face_verts[3]].co
+ ) / 4.0
@property
def edge_keys(self):
verts = self.vertices[:]
if len(verts) == 3:
- return ord_ind(verts[0], verts[1]), ord_ind(verts[1], verts[2]), ord_ind(verts[2], verts[0])
+ return (ord_ind(verts[0], verts[1]),
+ ord_ind(verts[1], verts[2]),
+ ord_ind(verts[2], verts[0]),
+ )
+ else:
+ return (ord_ind(verts[0], verts[1]),
+ ord_ind(verts[1], verts[2]),
+ ord_ind(verts[2], verts[3]),
+ ord_ind(verts[3], verts[0]),
+ )
- return ord_ind(verts[0], verts[1]), ord_ind(verts[1], verts[2]), ord_ind(verts[2], verts[3]), ord_ind(verts[3], verts[0])
-
class Text(bpy_types.ID):
__slots__ = ()
Deleted: branches/hive/release/scripts/startup/bl_operators/animsys_update.py
===================================================================
--- branches/hive/release/scripts/startup/bl_operators/animsys_update.py 2012-02-28 14:05:00 UTC (rev 44516)
+++ branches/hive/release/scripts/startup/bl_operators/animsys_update.py 2012-02-28 15:28:41 UTC (rev 44517)
@@ -1,700 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-data_path_update = [
- ("ClothCollisionSettings", "min_distance", "distance_min"),
- ("ClothCollisionSettings", "self_min_distance", "self_distance_min"),
- ("ClothCollisionSettings", "enable_collision", "use_collision"),
- ("ClothCollisionSettings", "enable_self_collision", "use_self_collision"),
- ("ClothSettings", "pin_cloth", "use_pin_cloth"),
- ("ClothSettings", "stiffness_scaling", "use_stiffness_scale"),
- ("CollisionSettings", "random_damping", "damping_random"),
- ("CollisionSettings", "random_friction", "friction_random"),
- ("CollisionSettings", "inner_thickness", "thickness_inner"),
- ("CollisionSettings", "outer_thickness", "thickness_outer"),
- ("CollisionSettings", "kill_particles", "use_particle_kill"),
- ("Constraint", "proxy_local", "is_proxy_local"),
- ("ActionConstraint", "maximum", "max"),
- ("ActionConstraint", "minimum", "min"),
- ("FollowPathConstraint", "use_fixed_position", "use_fixed_location"),
- ("KinematicConstraint", "chain_length", "chain_count"),
- ("KinematicConstraint", "pos_lock_x", "lock_location_x"),
- ("KinematicConstraint", "pos_lock_y", "lock_location_y"),
- ("KinematicConstraint", "pos_lock_z", "lock_location_z"),
- ("KinematicConstraint", "rot_lock_x", "lock_rotation_x"),
- ("KinematicConstraint", "rot_lock_y", "lock_rotation_y"),
- ("KinematicConstraint", "rot_lock_z", "lock_rotation_z"),
- ("KinematicConstraint", "axis_reference", "reference_axis"),
- ("KinematicConstraint", "use_position", "use_location"),
- ("LimitLocationConstraint", "maximum_x", "max_x"),
- ("LimitLocationConstraint", "maximum_y", "max_y"),
- ("LimitLocationConstraint", "maximum_z", "max_z"),
- ("LimitLocationConstraint", "minimum_x", "min_x"),
- ("LimitLocationConstraint", "minimum_y", "min_y"),
- ("LimitLocationConstraint", "minimum_z", "min_z"),
- ("LimitLocationConstraint", "use_maximum_x", "use_max_x"),
- ("LimitLocationConstraint", "use_maximum_y", "use_max_y"),
- ("LimitLocationConstraint", "use_maximum_z", "use_max_z"),
- ("LimitLocationConstraint", "use_minimum_x", "use_min_x"),
- ("LimitLocationConstraint", "use_minimum_y", "use_min_y"),
- ("LimitLocationConstraint", "use_minimum_z", "use_min_z"),
- ("LimitLocationConstraint", "limit_transform", "use_transform_limit"),
- ("LimitRotationConstraint", "maximum_x", "max_x"),
- ("LimitRotationConstraint", "maximum_y", "max_y"),
- ("LimitRotationConstraint", "maximum_z", "max_z"),
- ("LimitRotationConstraint", "minimum_x", "min_x"),
- ("LimitRotationConstraint", "minimum_y", "min_y"),
- ("LimitRotationConstraint", "minimum_z", "min_z"),
- ("LimitRotationConstraint", "limit_transform", "use_transform_limit"),
- ("LimitScaleConstraint", "maximum_x", "max_x"),
- ("LimitScaleConstraint", "maximum_y", "max_y"),
- ("LimitScaleConstraint", "maximum_z", "max_z"),
- ("LimitScaleConstraint", "minimum_x", "min_x"),
- ("LimitScaleConstraint", "minimum_y", "min_y"),
- ("LimitScaleConstraint", "minimum_z", "min_z"),
- ("LimitScaleConstraint", "use_maximum_x", "use_max_x"),
- ("LimitScaleConstraint", "use_maximum_y", "use_max_y"),
- ("LimitScaleConstraint", "use_maximum_z", "use_max_z"),
- ("LimitScaleConstraint", "use_minimum_x", "use_min_x"),
- ("LimitScaleConstraint", "use_minimum_y", "use_min_y"),
- ("LimitScaleConstraint", "use_minimum_z", "use_min_z"),
- ("LimitScaleConstraint", "limit_transform", "use_transform_limit"),
- ("PivotConstraint", "enabled_rotation_range", "rotation_range"),
- ("PivotConstraint", "use_relative_position", "use_relative_location"),
- ("PythonConstraint", "number_of_targets", "target_count"),
- ("SplineIKConstraint", "chain_length", "chain_count"),
- ("SplineIKConstraint", "chain_offset", "use_chain_offset"),
- ("SplineIKConstraint", "even_divisions", "use_even_divisions"),
- ("SplineIKConstraint", "y_stretch", "use_y_stretch"),
- ("SplineIKConstraint", "xz_scaling_mode", "xz_scale_mode"),
- ("StretchToConstraint", "original_length", "rest_length"),
- ("TrackToConstraint", "target_z", "use_target_z"),
- ("TransformConstraint", "extrapolate_motion", "use_motion_extrapolate"),
- ("FieldSettings", "do_location", "apply_to_location"),
- ("FieldSettings", "do_rotation", "apply_to_rotation"),
- ("FieldSettings", "maximum_distance", "distance_max"),
- ("FieldSettings", "minimum_distance", "distance_min"),
- ("FieldSettings", "radial_maximum", "radial_max"),
- ("FieldSettings", "radial_minimum", "radial_min"),
- ("FieldSettings", "force_2d", "use_2d_force"),
- ("FieldSettings", "do_absorption", "use_absorption"),
- ("FieldSettings", "global_coordinates", "use_global_coords"),
- ("FieldSettings", "guide_path_add", "use_guide_path_add"),
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list