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>2012-03-06 22:40:15 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-06 22:40:15 +0400
commit31d2ee9bf77bb991ea4779c47379b2cee84b27ed (patch)
treefd6f021356fc78d6dfeff9f18f601ce645dd7ffe /source/blender/makesrna
parent7b7214c72233f72268f72d31fd8626a0f94e557e (diff)
style cleanup, brackets in else/if, some indentation.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_actuator.c11
-rw-r--r--source/blender/makesrna/intern/rna_controller.c7
-rw-r--r--source/blender/makesrna/intern/rna_modifier.c3
-rw-r--r--source/blender/makesrna/intern/rna_object.c3
-rw-r--r--source/blender/makesrna/intern/rna_scene.c3
-rw-r--r--source/blender/makesrna/intern/rna_space.c3
6 files changed, 12 insertions, 18 deletions
diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c
index 4b7bc0a6160..78555d2a877 100644
--- a/source/blender/makesrna/intern/rna_actuator.c
+++ b/source/blender/makesrna/intern/rna_actuator.c
@@ -124,8 +124,8 @@ void rna_Actuator_name_set(PointerRNA *ptr, const char *value)
static void rna_Actuator_type_set(struct PointerRNA *ptr, int value)
{
bActuator *act = (bActuator *)ptr->data;
- if (value != act->type)
- {
+
+ if (value != act->type) {
act->type = value;
init_actuator(act);
}
@@ -135,8 +135,8 @@ static void rna_ConstraintActuator_type_set(struct PointerRNA *ptr, int value)
{
bActuator *act = (bActuator *)ptr->data;
bConstraintActuator *ca = act->data;
- if (value != ca->type)
- {
+
+ if (value != ca->type) {
ca->type = value;
switch (ca->type) {
case ACT_CONST_TYPE_ORI:
@@ -364,8 +364,7 @@ static void rna_ObjectActuator_type_set(struct PointerRNA *ptr, int value)
{
bActuator *act = (bActuator *)ptr->data;
bObjectActuator *oa = act->data;
- if (value != oa->type)
- {
+ if (value != oa->type) {
oa->type = value;
switch (oa->type) {
case ACT_OBJECT_NORMAL:
diff --git a/source/blender/makesrna/intern/rna_controller.c b/source/blender/makesrna/intern/rna_controller.c
index f81610a4024..b066114a0cb 100644
--- a/source/blender/makesrna/intern/rna_controller.c
+++ b/source/blender/makesrna/intern/rna_controller.c
@@ -91,8 +91,8 @@ void rna_Constroller_name_set(PointerRNA *ptr, const char *value)
static void rna_Controller_type_set(struct PointerRNA *ptr, int value)
{
bController *cont = (bController *)ptr->data;
- if (value != cont->type)
- {
+
+ if (value != cont->type) {
cont->type = value;
init_controller(cont);
}
@@ -104,8 +104,7 @@ static void rna_Controller_mode_set(struct PointerRNA *ptr, int value)
bPythonCont *pycon = (bPythonCont *)cont->data;
/* if mode changed and previous mode were Script */
- if (value != pycon->mode && pycon->mode == CONT_PY_SCRIPT)
- {
+ if (value != pycon->mode && pycon->mode == CONT_PY_SCRIPT) {
/* clear script to avoid it to get linked with the controller */
pycon->text = NULL;
}
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 99440836028..6185d1dee79 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -272,8 +272,7 @@ static void rna_Smoke_set_type(Main *bmain, Scene *scene, PointerRNA *ptr)
if (ob->type == OB_MESH && !psys) {
/* add particle system */
psmd = (ParticleSystemModifierData *)object_add_particle_system(scene, ob, NULL);
- if (psmd)
- {
+ if (psmd) {
psys = psmd->psys;
part = psys->part;
part->lifetime = 1.0f;
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 6f7c22389c6..a1e288f6107 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -934,8 +934,7 @@ static void rna_GameObjectSettings_physics_type_set(PointerRNA *ptr, int value)
ob->gameflag &= ~(OB_RIGID_BODY|OB_OCCLUDER|OB_SENSOR|OB_NAVMESH);
/* assume triangle mesh, if no bounds chosen for soft body */
- if ((ob->gameflag & OB_BOUNDS) && (ob->boundtype<OB_BOUND_TRIANGLE_MESH))
- {
+ if ((ob->gameflag & OB_BOUNDS) && (ob->boundtype<OB_BOUND_TRIANGLE_MESH)) {
ob->boundtype = OB_BOUND_TRIANGLE_MESH;
}
/* create a BulletSoftBody structure if not already existing */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index e6eb07cf44f..4c4123b2ed3 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1247,8 +1247,7 @@ static void rna_Scene_sync_mode_set(PointerRNA *ptr, int value)
scene->audio.flag &= ~AUDIO_SYNC;
scene->flag |= SCE_FRAME_DROP;
}
- else
- {
+ else {
scene->audio.flag &= ~AUDIO_SYNC;
scene->flag &= ~SCE_FRAME_DROP;
}
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index bf4814d8d0d..3b34ec235a3 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -255,8 +255,7 @@ EnumPropertyItem *rna_TransformOrientation_itemf(bContext *C, PointerRNA *ptr, P
ts = transform_spaces->first;
}
- if (ts)
- {
+ if (ts) {
RNA_enum_item_add_separator(&item, &totitem);
for (; ts; ts = ts->next) {