diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2010-06-09 12:00:45 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2010-06-09 12:00:45 +0400 |
| commit | 3e56c4dda180103f71cf20ccaa76a2d70f363bb7 (patch) | |
| tree | 37b30512edf877bd53bfec3258fc038f709ad50c /source/blender/blenkernel | |
| parent | 668a5156cd67bfc45f308afa712d87849ddd66d7 (diff) | |
Logic Editor: bugfix for "Unable to Add Controllers sometimes" (reported in IRC by Daniel Salazar (ZanQdo)
What was happening; if
the old code (2.49) was changing the status from 0 to 1 inside the interface code. e.g. if (!ob->status) ob->status = 1;
Initializing it properly (in blenkernel) and making sure the new status is ever 0 (in rna_object.c) should fix it.
And yes, the log is bigger than the patch !
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 179e83fdc66..c544e27a102 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1026,6 +1026,8 @@ Object *add_only_object(int type, char *name) ob->anisotropicFriction[2] = 1.0f; ob->gameflag= OB_PROP|OB_COLLISION; ob->margin = 0.0; + ob->init_state=1; + ob->state=1; /* ob->pad3 == Contact Processing Threshold */ ob->m_contactProcessingThreshold = 1.; |