Revision: 20588
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20588
Author: blendix
Date: 2009-06-03 01:56:33 +0200 (Wed, 03 Jun 2009)
Log Message:
-----------
2.5:
* Fix crash adding rigid body constraint.
* Give new nodetrees NT in ID name to make them recognizned by RNA,
even if the nodetrees aren't actual ID datablock.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/node.c
branches/blender2.5/blender/source/blender/editors/object/editconstraint.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/node.c
2009-06-02 23:53:40 UTC (rev 20587)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/node.c
2009-06-02 23:56:33 UTC (rev 20588)
@@ -1055,6 +1055,14 @@
ntree->type= type;
ntree->alltypes.first = NULL;
ntree->alltypes.last = NULL;
+
+ /* this helps RNA identify ID pointers as nodetree */
+ if(ntree->type==NTREE_SHADER)
+ BLI_strncpy(ntree->id.name, "NTShader Nodetree",
sizeof(ntree->id.name));
+ else if(ntree->type==NTREE_COMPOSIT)
+ BLI_strncpy(ntree->id.name, "NTComposit Nodetree",
sizeof(ntree->id.name));
+ else if(ntree->type==NTREE_TEXTURE)
+ BLI_strncpy(ntree->id.name, "NTTexture Nodetree",
sizeof(ntree->id.name));
ntreeInitTypes(ntree);
return ntree;
Modified:
branches/blender2.5/blender/source/blender/editors/object/editconstraint.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/editconstraint.c
2009-06-02 23:53:40 UTC (rev 20587)
+++ branches/blender2.5/blender/source/blender/editors/object/editconstraint.c
2009-06-02 23:56:33 UTC (rev 20588)
@@ -1000,7 +1000,7 @@
{
Scene *scene= CTX_data_scene(C);
Object *ob = CTX_data_active_object(C);
- bConstraint *con;
+ bConstraint *con, *coniter;
ListBase *list= get_active_constraints(ob);
bPoseChannel *pchan= get_active_posechannel(ob);
int type= RNA_enum_get(op->ptr, "type");
@@ -1015,8 +1015,8 @@
con->flag |= CONSTRAINT_PROXY_LOCAL;
con->flag |= CONSTRAINT_ACTIVE;
- for(con= con->prev; con; con= con->prev)
- con->flag &= ~CONSTRAINT_ACTIVE;
+ for(coniter= coniter->prev; coniter; coniter= coniter->prev)
+ coniter->flag &= ~CONSTRAINT_ACTIVE;
}
switch(type) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
