Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-02-03 06:55:26 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-02-03 06:56:34 +0400
commit1dc1d92dabe08fd78791ab02295c65adefdb61c8 (patch)
treecea2c3857deb2ca923f041a7e3acce2dc30a1777 /source/blender/blenkernel/intern/object.c
parent236e46835908f05a54e09cf2774386e5a8ef8be1 (diff)
Code cleanup: white space and cmake was broken on all platforms
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
-rw-r--r--source/blender/blenkernel/intern/object.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 94ff1026d12..b8d4ef8167c 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2659,23 +2659,23 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us
void BKE_object_empty_draw_type_set(Object *ob, const int value)
{
- ob->empty_drawtype = value;
-
- if (ob->type == OB_EMPTY && ob->empty_drawtype == OB_EMPTY_IMAGE) {
- if (!ob->iuser) {
- ob->iuser = MEM_callocN(sizeof(ImageUser), "image user");
- ob->iuser->ok = 1;
- ob->iuser->frames = 100;
- ob->iuser->sfra = 1;
- ob->iuser->fie_ima = 2;
- }
- }
- else {
- if (ob->iuser) {
- MEM_freeN(ob->iuser);
- ob->iuser = NULL;
- }
- }
+ ob->empty_drawtype = value;
+
+ if (ob->type == OB_EMPTY && ob->empty_drawtype == OB_EMPTY_IMAGE) {
+ if (!ob->iuser) {
+ ob->iuser = MEM_callocN(sizeof(ImageUser), "image user");
+ ob->iuser->ok = 1;
+ ob->iuser->frames = 100;
+ ob->iuser->sfra = 1;
+ ob->iuser->fie_ima = 2;
+ }
+ }
+ else {
+ if (ob->iuser) {
+ MEM_freeN(ob->iuser);
+ ob->iuser = NULL;
+ }
+ }
}
bool BKE_object_minmax_dupli(Scene *scene, Object *ob, float r_min[3], float r_max[3], const bool use_hidden)