Revision: 27780
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27780
Author: kjym3
Date: 2010-03-26 21:18:39 +0100 (Fri, 26 Mar 2010)
Log Message:
-----------
Merged changes in the trunk up to revision 27779.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27779
Modified Paths:
--------------
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_cloth.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_action.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_collision.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_curve.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/implicit.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_cloth_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_cloth.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_pose.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/GameTypes.py
branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_Node.cpp
branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_Node.h
Modified:
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
2010-03-26 18:15:06 UTC (rev 27779)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
2010-03-26 20:18:39 UTC (rev 27780)
@@ -507,7 +507,8 @@
col.prop(md, "steps")
col.prop(md, "render_steps")
- col = split.column()
+ if wide_ui:
+ col = split.column()
row = col.row()
row.active = (md.object is None or md.use_object_screw_offset == False)
row.prop(md, "screw_offset")
Modified: branches/soc-2008-mxcurioni/release/scripts/ui/properties_object.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/properties_object.py
2010-03-26 18:15:06 UTC (rev 27779)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/properties_object.py
2010-03-26 20:18:39 UTC (rev 27780)
@@ -268,9 +268,10 @@
else:
layout.prop(ob, "dupli_group", text="")
-
+# XXX: the following options are all quite buggy, ancient hacks that should be
dropped
class OBJECT_PT_animation(ObjectButtonsPanel):
- bl_label = "Animation"
+ bl_label = "Animation Hacks"
+ bl_default_closed = True
def draw(self, context):
layout = self.layout
@@ -293,16 +294,13 @@
row.prop(ob, "slow_parent")
row.active = (ob.parent is not None)
col.prop(ob, "time_offset", text="Offset")
-
+
+ # XXX: these are still used for a few curve-related tracking features
if wide_ui:
col = split.column()
- col.label(text="Track:")
- col.prop(ob, "track", text="")
+ col.label(text="Tracking Axes:")
col.prop(ob, "track_axis", text="Axis")
col.prop(ob, "up_axis", text="Up Axis")
- row = col.row()
- row.prop(ob, "track_override_parent", text="Override Parent")
- row.active = (ob.parent is not None)
# import generic panels from other files
@@ -316,7 +314,7 @@
OBJECT_PT_groups,
OBJECT_PT_display,
OBJECT_PT_duplication,
- OBJECT_PT_animation,
+ OBJECT_PT_animation, # XXX: panel of old hacks pending to be removed...
OBJECT_PT_motion_paths,
#OBJECT_PT_onion_skinning,
Modified:
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_cloth.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_cloth.py
2010-03-26 18:15:06 UTC (rev 27779)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_cloth.py
2010-03-26 20:18:39 UTC (rev 27780)
@@ -179,6 +179,7 @@
sub.prop(cloth, "self_collision_quality", slider=True, text="Quality")
sub.prop(cloth, "self_min_distance", slider=True, text="Distance")
+ layout.prop(cloth, "group")
class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel):
bl_label = "Cloth Stiffness Scaling"
Modified: branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
2010-03-26 18:15:06 UTC (rev 27779)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
2010-03-26 20:18:39 UTC (rev 27780)
@@ -342,7 +342,7 @@
# ima = sima.image
iuser = sima.image_user
- layout.template_image(sima, "image", iuser, compact=True)
+ layout.template_image(sima, "image", iuser)
class IMAGE_PT_game_properties(bpy.types.Panel):
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_action.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_action.h
2010-03-26 18:15:06 UTC (rev 27779)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_action.h
2010-03-26 20:18:39 UTC (rev 27780)
@@ -129,6 +129,13 @@
*/
void free_pose_channels(struct bPose *pose);
+/**
+ * Removes the hash for quick lookup of channels, must
+ * be done when adding/removing channels.
+ */
+void make_pose_channels_hash(struct bPose *pose);
+void free_pose_channels_hash(struct bPose *pose);
+
/**
* Removes and deallocates all data from a pose, and also frees the pose.
*/
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
2010-03-26 18:15:06 UTC (rev 27779)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
2010-03-26 20:18:39 UTC (rev 27780)
@@ -45,7 +45,7 @@
struct Main;
#define BLENDER_VERSION 252
-#define BLENDER_SUBVERSION 1
+#define BLENDER_SUBVERSION 2
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_collision.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_collision.h
2010-03-26 18:15:06 UTC (rev 27779)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_collision.h
2010-03-26 20:18:39 UTC (rev 27780)
@@ -49,12 +49,13 @@
#include "BLI_kdopbvh.h"
+struct Cloth;
+struct ClothModifierData;
+struct DerivedMesh;
+struct Group;
+struct MFace;
struct Object;
struct Scene;
-struct Cloth;
-struct MFace;
-struct DerivedMesh;
-struct ClothModifierData;
////////////////////////////////////////
// used for collisions in collision.c
@@ -139,7 +140,7 @@
/////////////////////////////////////////////////
// used in effect.c
/////////////////////////////////////////////////
-Object **get_collisionobjects(struct Scene *scene, Object *self, int
*numcollobj);
+struct Object **get_collisionobjects(struct Scene *scene, struct Object *self,
struct Group *group, int *numcollobj);
typedef struct ColliderCache {
struct ColliderCache *next, *prev;
@@ -147,7 +148,7 @@
struct CollisionModifierData *collmd;
} ColliderCache;
-struct ListBase *get_collider_cache(struct Scene *scene, Object *self);
+struct ListBase *get_collider_cache(struct Scene *scene, struct Object *self,
struct Group *group);
void free_collider_cache(struct ListBase **colliders);
/////////////////////////////////////////////////
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_curve.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_curve.h
2010-03-26 18:15:06 UTC (rev 27779)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_curve.h
2010-03-26 20:18:39 UTC (rev 27780)
@@ -76,7 +76,7 @@
void forward_diff_bezier(float q0, float q1, float q2, float q3, float *p, int
it, int stride);
float *make_orco_curve(struct Scene *scene, struct Object *ob);
float *make_orco_surf( struct Object *ob);
-void makebevelcurve(struct Scene *scene, struct Object *ob, struct ListBase
*disp);
+void makebevelcurve(struct Scene *scene, struct Object *ob, struct ListBase
*disp, int forRender);
void makeBevelList( struct Object *ob);
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
2010-03-26 18:15:06 UTC (rev 27779)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
2010-03-26 20:18:39 UTC (rev 27780)
@@ -56,8 +56,9 @@
#include "BIK_api.h"
+#include "BLI_blenlib.h"
+#include "BLI_ghash.h"
#include "BLI_math.h"
-#include "BLI_blenlib.h"
#include "RNA_access.h"
@@ -370,6 +371,9 @@
if (ELEM(NULL, pose, name) || (name[0] == 0))
return NULL;
+ if(pose->chanhash)
+ return BLI_ghash_lookup(pose->chanhash, name);
+
return BLI_findstring(&((bPose *)pose)->chanbase, name,
offsetof(bPoseChannel, name));
}
@@ -405,6 +409,7 @@
chan->protectflag = OB_LOCK_ROT4D; /* lock by components by
default */
BLI_addtail(&pose->chanbase, chan);
+ free_pose_channels_hash(pose);
return chan;
}
@@ -519,6 +524,26 @@
}
}
+void make_pose_channels_hash(bPose *pose)
+{
+ if(!pose->chanhash) {
+ bPoseChannel *pchan;
+
+ pose->chanhash= BLI_ghash_new(BLI_ghashutil_strhash,
BLI_ghashutil_strcmp);
+ for(pchan=pose->chanbase.first; pchan; pchan=pchan->next)
+ BLI_ghash_insert(pose->chanhash, pchan->name, pchan);
+ }
+}
+
+void free_pose_channels_hash(bPose *pose)
+{
+ if(pose->chanhash) {
+ BLI_ghash_free(pose->chanhash, NULL, NULL);
+ pose->chanhash= NULL;
+ }
+}
+
+
void free_pose_channel(bPoseChannel *pchan)
{
// XXX this case here will need to be removed when the new motionpaths
are ready
@@ -550,6 +575,8 @@
BLI_freelistN(&pose->chanbase);
}
+
+ free_pose_channels_hash(pose);
}
void free_pose(bPose *pose)
@@ -1063,7 +1090,6 @@
copy_m4_m4(workob->parentinv, ob->parentinv);
copy_m4_m4(workob->constinv, ob->constinv);
workob->parent= ob->parent;
- workob->track= ob->track;
workob->rotmode= ob->rotmode;
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
2010-03-26 18:15:06 UTC (rev 27779)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
2010-03-26 20:18:39 UTC (rev 27780)
@@ -668,7 +668,7 @@
if(level>MAX_DUPLI_RECUR) return;
cfrao= scene->r.cfra;
- if(ob->parent==NULL && ob->track==NULL && ob->ipo==NULL &&
ob->constraints.first==NULL) return;
+ if(ob->parent==NULL && ob->constraints.first==NULL) return;
if(ob->transflag & OB_DUPLINOSPEED) enable_cu_speed= 0;
copyob= *ob; /* store transform info */
Modified:
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
2010-03-26 18:15:06 UTC (rev 27779)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
2010-03-26 20:18:39 UTC (rev 27780)
@@ -1675,6 +1675,7 @@
next= pchan->next;
if(pchan->bone==NULL) {
free_pose_channel(pchan);
+ free_pose_channels_hash(pose);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
