diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-04-20 20:34:26 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-04-20 20:34:26 +0300 |
| commit | 734ee5a43ab40e7b64a8f28b349690830aa4f7c7 (patch) | |
| tree | da6af725e1b1c485b6da0f4af048650b76248f67 /source/blender/makesrna/intern/rna_object.c | |
| parent | a7880dd5c8df6890e572aadd160949e81f6f1b51 (diff) | |
| parent | aa880bb815e7707255f7d450f4add1b042f119fa (diff) | |
Merge branch 'master' into alembic
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index b83a9c87513..2fe07ef47dc 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -1013,7 +1013,7 @@ static int rna_GameObjectSettings_physics_type_get(PointerRNA *ptr) static void rna_GameObjectSettings_physics_type_set(PointerRNA *ptr, int value) { Object *ob = (Object *)ptr->id.data; - const int was_navmesh = (ob->gameflag & OB_NAVMESH); + const int gameflag_prev = ob->gameflag; ob->body_type = value; switch (ob->body_type) { @@ -1071,7 +1071,7 @@ static void rna_GameObjectSettings_physics_type_set(PointerRNA *ptr, int value) break; } - if (was_navmesh != (ob->gameflag & OB_NAVMESH)) { + if ((gameflag_prev & OB_NAVMESH) != (ob->gameflag & OB_NAVMESH)) { if (ob->type == OB_MESH) { /* this is needed to refresh the derived meshes draw func */ DAG_id_tag_update(ptr->id.data, OB_RECALC_DATA); |