diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-28 18:48:59 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-28 18:48:59 +0300 |
| commit | 8ead56c4c974ea3f7481be61c74a0bbd5b8cde83 (patch) | |
| tree | 80a55f0ac146c8379a14397649c6d57623f5cf50 /source/blender/makesrna/intern/rna_object.c | |
| parent | 6dfe56f01a2bac39e848316bcfa6882318768c3b (diff) | |
| parent | b947810291b16d3f304e2cd59f94c96c5f6e6f51 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 2de3d472ce3..7eb9c77d76a 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -423,11 +423,7 @@ static void rna_Object_parent_set(PointerRNA *ptr, PointerRNA value) { Object *ob = (Object *)ptr->data; Object *par = (Object *)value.data; - -#ifdef FREE_WINDOWS - /* NOTE: this dummy check here prevents this method causing weird runtime errors on mingw 4.6.2 */ - if (ob) -#endif + { ED_object_parent(ob, par, ob->partype, ob->parsubstr); } |