[Bf-blender-cvs] [49c7b345471] master: Cleanup some Object's bbox code.

[Bastien Montagne]

Commit: 49c7b345471b0d369305d5a143d487842d23ed6c
Author: Bastien Montagne
Date:   Mon Feb 18 17:55:44 2019 +0100
Branches: master
https://developer.blender.org/rB49c7b345471b0d369305d5a143d487842d23ed6c

Cleanup some Object's bbox code.

Now that bbox is in runtime, no need to explicitely clear it when we
call BKE_object_runtime_reset() two lines below.

===================================================================

M	source/blender/blenkernel/intern/object.c
M	source/blender/blenloader/intern/readfile.c

===================================================================

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 4db68abf1a8..b9c9cf49d92 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -450,10 +450,7 @@ void BKE_object_free_derived_caches(Object *ob)
 		}
 	}
 
-	if (ob->runtime.bb) {
-		MEM_freeN(ob->runtime.bb);
-		ob->runtime.bb = NULL;
-	}
+	MEM_SAFE_FREE(ob->runtime.bb);
 
 	object_update_from_subsurf_ccg(ob);
 	BKE_object_free_derived_mesh_caches(ob);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 8259a5ef510..745fccdcbad 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5655,7 +5655,6 @@ static void direct_link_object(FileData *fd, Object *ob)
 		BKE_object_empty_draw_type_set(ob, ob->empty_drawtype);
 	}
 
-	ob->runtime.bb = NULL;
 	ob->derivedDeform = NULL;
 	ob->derivedFinal = NULL;
 	BKE_object_runtime_reset(ob);