diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-07-29 04:44:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-07-29 04:44:53 +0400 |
| commit | 88cbcb0206b7f727b24c6018a24dc1c1a08e9531 (patch) | |
| tree | a34fbde02388481dcf6f54a614e6735c6b6a1cdc /source/blender/makesrna | |
| parent | 7ef2e33ea331561691fbc189fa88d34f77ef896e (diff) | |
bugfix [#23062] Resolve conflict button in text editor dissappers in Blener 2.5 beta release
also uncommented console some code for testing by mistake & remove warning.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index f4398b99beb..4ace614640c 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -242,7 +242,7 @@ static void rna_Smoke_set_type(Main *bmain, Scene *scene, PointerRNA *ptr) break; if(ob->type == OB_MESH && !psys) { /* add particle system */ - psmd = object_add_particle_system(scene, ob, NULL); + psmd = (ParticleSystemModifierData *)object_add_particle_system(scene, ob, NULL); if(psmd) { psys = psmd->psys; |