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>2018-06-17 18:05:51 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-06-17 18:05:51 +0300
commit6fc8a74886a30f89562bb542ef3b24cc64b3208a (patch)
treedf0503b6cf4f6b762eca66b90f4360c495d624aa /source/blender/blenkernel/intern/sca.c
parenta262ea8c47f8106f66e16935c556f383ef306861 (diff)
Cleanup: trailing space for blenkernel
Diffstat (limited to 'source/blender/blenkernel/intern/sca.c')
-rw-r--r--source/blender/blenkernel/intern/sca.c84
1 files changed, 42 insertions, 42 deletions
diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c
index fb81ed4d47f..6f288258a00 100644
--- a/source/blender/blenkernel/intern/sca.c
+++ b/source/blender/blenkernel/intern/sca.c
@@ -60,13 +60,13 @@ void free_sensor(bSensor *sens)
if (sens->links) MEM_freeN(sens->links);
if (sens->data) MEM_freeN(sens->data);
MEM_freeN(sens);
-
+
}
void free_sensors(ListBase *lb)
{
bSensor *sens;
-
+
while ((sens = BLI_pophead(lb))) {
free_sensor(sens);
}
@@ -75,7 +75,7 @@ void free_sensors(ListBase *lb)
bSensor *copy_sensor(bSensor *sens, const int UNUSED(flag))
{
bSensor *sensn;
-
+
sensn= MEM_dupallocN(sens);
sensn->flag |= SENS_NEW;
if (sens->data) {
@@ -83,14 +83,14 @@ bSensor *copy_sensor(bSensor *sens, const int UNUSED(flag))
}
if (sens->links) sensn->links= MEM_dupallocN(sens->links);
-
+
return sensn;
}
void copy_sensors(ListBase *lbn, const ListBase *lbo, const int flag)
{
bSensor *sens, *sensn;
-
+
lbn->first= lbn->last= NULL;
sens= lbo->first;
while (sens) {
@@ -107,11 +107,11 @@ void init_sensor(bSensor *sens)
bMouseSensor *ms;
bJoystickSensor *js;
bRaySensor *rs;
-
+
if (sens->data) MEM_freeN(sens->data);
sens->data= NULL;
sens->pulse = 0;
-
+
switch (sens->type) {
case SENS_ALWAYS:
sens->pulse = 0;
@@ -177,12 +177,12 @@ bSensor *new_sensor(int type)
sens= MEM_callocN(sizeof(bSensor), "Sensor");
sens->type= type;
sens->flag= SENS_SHOW;
-
+
init_sensor(sens);
-
+
strcpy(sens->name, "sensor");
// XXX make_unique_prop_names(sens->name);
-
+
return sens;
}
@@ -192,7 +192,7 @@ void unlink_controller(bController *cont)
{
bSensor *sens;
Object *ob;
-
+
/* check for controller pointers in sensors */
ob= G.main->object.first;
while (ob) {
@@ -208,7 +208,7 @@ void unlink_controller(bController *cont)
void unlink_controllers(ListBase *lb)
{
bController *cont;
-
+
for (cont= lb->first; cont; cont= cont->next)
unlink_controller(cont);
}
@@ -220,13 +220,13 @@ void free_controller(bController *cont)
/* the controller itself */
if (cont->data) MEM_freeN(cont->data);
MEM_freeN(cont);
-
+
}
void free_controllers(ListBase *lb)
{
bController *cont;
-
+
while ((cont = BLI_pophead(lb))) {
if (cont->slinks)
MEM_freeN(cont->slinks);
@@ -237,7 +237,7 @@ void free_controllers(ListBase *lb)
bController *copy_controller(bController *cont, const int UNUSED(flag))
{
bController *contn;
-
+
cont->mynew=contn= MEM_dupallocN(cont);
contn->flag |= CONT_NEW;
if (cont->data) {
@@ -247,14 +247,14 @@ bController *copy_controller(bController *cont, const int UNUSED(flag))
if (cont->links) contn->links= MEM_dupallocN(cont->links);
contn->slinks= NULL;
contn->totslinks= 0;
-
+
return contn;
}
void copy_controllers(ListBase *lbn, const ListBase *lbo, const int flag)
{
bController *cont, *contn;
-
+
lbn->first= lbn->last= NULL;
cont= lbo->first;
while (cont) {
@@ -267,10 +267,10 @@ void copy_controllers(ListBase *lbn, const ListBase *lbo, const int flag)
void init_controller(bController *cont)
{
/* also use when controller changes type, leave actuators... */
-
+
if (cont->data) MEM_freeN(cont->data);
cont->data= NULL;
-
+
switch (cont->type) {
case CONT_EXPRESSION:
cont->data= MEM_callocN(sizeof(bExpressionCont), "expcont");
@@ -290,10 +290,10 @@ bController *new_controller(int type)
cont->flag= CONT_SHOW;
init_controller(cont);
-
+
strcpy(cont->name, "cont");
// XXX make_unique_prop_names(cont->name);
-
+
return cont;
}
@@ -303,7 +303,7 @@ void unlink_actuator(bActuator *act)
{
bController *cont;
Object *ob;
-
+
/* check for actuator pointers in controllers */
ob= G.main->object.first;
while (ob) {
@@ -319,7 +319,7 @@ void unlink_actuator(bActuator *act)
void unlink_actuators(ListBase *lb)
{
bActuator *act;
-
+
for (act= lb->first; act; act= act->next)
unlink_actuator(act);
}
@@ -353,7 +353,7 @@ void free_actuator(bActuator *act)
void free_actuators(ListBase *lb)
{
bActuator *act;
-
+
while ((act = BLI_pophead(lb))) {
free_actuator(act);
}
@@ -362,13 +362,13 @@ void free_actuators(ListBase *lb)
bActuator *copy_actuator(bActuator *act, const int flag)
{
bActuator *actn;
-
+
act->mynew=actn= MEM_dupallocN(act);
actn->flag |= ACT_NEW;
if (act->data) {
actn->data= MEM_dupallocN(act->data);
}
-
+
switch (act->type) {
case ACT_ACTION:
case ACT_SHAPEACTION:
@@ -394,7 +394,7 @@ bActuator *copy_actuator(bActuator *act, const int flag)
void copy_actuators(ListBase *lbn, const ListBase *lbo, const int flag)
{
bActuator *act, *actn;
-
+
lbn->first= lbn->last= NULL;
act= lbo->first;
while (act) {
@@ -415,10 +415,10 @@ void init_actuator(bActuator *act)
bArmatureActuator *arma;
bMouseActuator *ma;
bEditObjectActuator *eoa;
-
+
if (act->data) MEM_freeN(act->data);
act->data= NULL;
-
+
switch (act->type) {
case ACT_ACTION:
case ACT_SHAPEACTION:
@@ -523,12 +523,12 @@ bActuator *new_actuator(int type)
act= MEM_callocN(sizeof(bActuator), "Actuator");
act->type= type;
act->flag= ACT_SHOW;
-
+
init_actuator(act);
-
+
strcpy(act->name, "act");
// XXX make_unique_prop_names(act->name);
-
+
return act;
}
@@ -538,7 +538,7 @@ void clear_sca_new_poins_ob(Object *ob)
bSensor *sens;
bController *cont;
bActuator *act;
-
+
sens= ob->sensors.first;
while (sens) {
sens->flag &= ~SENS_NEW;
@@ -561,7 +561,7 @@ void clear_sca_new_poins_ob(Object *ob)
void clear_sca_new_poins(void)
{
Object *ob;
-
+
ob= G.main->object.first;
while (ob) {
clear_sca_new_poins_ob(ob);
@@ -575,7 +575,7 @@ void set_sca_new_poins_ob(Object *ob)
bController *cont;
bActuator *act;
int a;
-
+
sens= ob->sensors.first;
while (sens) {
if (sens->flag & SENS_NEW) {
@@ -597,8 +597,8 @@ void set_sca_new_poins_ob(Object *ob)
}
cont= cont->next;
}
-
-
+
+
act= ob->actuators.first;
while (act) {
if (act->flag & ACT_NEW) {
@@ -649,7 +649,7 @@ void set_sca_new_poins_ob(Object *ob)
void set_sca_new_poins(void)
{
Object *ob;
-
+
ob= G.main->object.first;
while (ob) {
set_sca_new_poins_ob(ob);
@@ -872,7 +872,7 @@ void sca_move_controller(bController *cont_to_move, Object *ob, int move_up)
/* locate the controller that has the same state mask but is earlier in the list */
tmp = cont->prev;
while (tmp) {
- if (tmp->state_mask & cont->state_mask)
+ if (tmp->state_mask & cont->state_mask)
break;
tmp = tmp->prev;
}
@@ -886,7 +886,7 @@ void sca_move_controller(bController *cont_to_move, Object *ob, int move_up)
else if (val == 2 && cont->next) {
tmp = cont->next;
while (tmp) {
- if (tmp->state_mask & cont->state_mask)
+ if (tmp->state_mask & cont->state_mask)
break;
tmp = tmp->next;
}
@@ -939,7 +939,7 @@ void sca_move_actuator(bActuator *act_to_move, Object *ob, int move_up)
void link_logicbricks(void **poin, void ***ppoin, short *tot, short size)
{
void **old_links= NULL;
-
+
int ibrick;
/* check if the bricks are already linked */
@@ -953,7 +953,7 @@ void link_logicbricks(void **poin, void ***ppoin, short *tot, short size)
(*tot) ++;
*ppoin = MEM_callocN((*tot)*size, "new link");
-
+
for (ibrick=0; ibrick < *(tot) - 1; ibrick++) {
(*ppoin)[ibrick] = old_links[ibrick];
}