[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47808] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Wed Jun 13 00:05:46 CEST 2012
Revision: 47808
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47808
Author: campbellbarton
Date: 2012-06-12 22:05:33 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_object.h
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/collada/AnimationExporter.cpp
trunk/blender/source/blender/collada/AnimationImporter.cpp
trunk/blender/source/blender/collada/ArmatureExporter.cpp
trunk/blender/source/blender/collada/ArmatureImporter.cpp
trunk/blender/source/blender/collada/CameraExporter.cpp
trunk/blender/source/blender/collada/DocumentExporter.cpp
trunk/blender/source/blender/collada/DocumentImporter.cpp
trunk/blender/source/blender/collada/EffectExporter.cpp
trunk/blender/source/blender/collada/ErrorHandler.cpp
trunk/blender/source/blender/collada/ExtraHandler.cpp
trunk/blender/source/blender/collada/ExtraTags.cpp
trunk/blender/source/blender/collada/GeometryExporter.cpp
trunk/blender/source/blender/collada/ImageExporter.cpp
trunk/blender/source/blender/collada/InstanceWriter.cpp
trunk/blender/source/blender/collada/LightExporter.cpp
trunk/blender/source/blender/collada/MaterialExporter.cpp
trunk/blender/source/blender/collada/MeshImporter.cpp
trunk/blender/source/blender/collada/SceneExporter.cpp
trunk/blender/source/blender/collada/SkinInfo.cpp
trunk/blender/source/blender/collada/TransformReader.cpp
trunk/blender/source/blender/collada/TransformWriter.cpp
trunk/blender/source/blender/collada/collada.cpp
trunk/blender/source/blender/collada/collada_internal.cpp
trunk/blender/source/blender/collada/collada_utils.cpp
trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/blenkernel/BKE_object.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_object.h 2012-06-12 21:32:41 UTC (rev 47807)
+++ trunk/blender/source/blender/blenkernel/BKE_object.h 2012-06-12 22:05:33 UTC (rev 47808)
@@ -161,13 +161,13 @@
/* this function returns a superset of the scenes selection based on relationships */
typedef enum eObRelationTypes {
- OB_REL_NONE = 0, /* just the selection as is */
- OB_REL_PARENT = (1<<0), /* immediate parent */
- OB_REL_PARENT_RECURSIVE = (1<<1), /* parents up to root of selection tree*/
- OB_REL_CHILDREN = (1<<2), /* immediate children */
- OB_REL_CHILDREN_RECURSIVE = (1<<3), /* All children */
- OB_REL_MOD_ARMATURE = (1<<4), /* Armatures related to the selected objects */
- OB_REL_SCENE_CAMERA = (1<<5), /* you might want the scene camera too even if unselected? */
+ OB_REL_NONE = 0, /* just the selection as is */
+ OB_REL_PARENT = (1 << 0), /* immediate parent */
+ OB_REL_PARENT_RECURSIVE = (1 << 1), /* parents up to root of selection tree*/
+ OB_REL_CHILDREN = (1 << 2), /* immediate children */
+ OB_REL_CHILDREN_RECURSIVE = (1 << 3), /* All children */
+ OB_REL_MOD_ARMATURE = (1 << 4), /* Armatures related to the selected objects */
+ OB_REL_SCENE_CAMERA = (1 << 5), /* you might want the scene camera too even if unselected? */
} eObRelationTypes;
typedef enum eObjectSet {
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2012-06-12 21:32:41 UTC (rev 47807)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2012-06-12 22:05:33 UTC (rev 47808)
@@ -3090,13 +3090,11 @@
ob_arm = ob->parent;
}
else {
- ModifierData *mod = (ModifierData*)ob->modifiers.first;
- while (mod) {
+ ModifierData *mod;
+ for (mod = (ModifierData *)ob->modifiers.first; mod; mod = mod->next) {
if (mod->type == eModifierType_Armature) {
- ob_arm = ((ArmatureModifierData*)mod)->object;
+ ob_arm = ((ArmatureModifierData *)mod)->object;
}
-
- mod = mod->next;
}
}
@@ -3104,11 +3102,11 @@
}
static int obrel_is_recursive_child(Object *ob, Object *child) {
- Object *ancestor = child->parent;
- while (ancestor)
- {
- if(ancestor == ob) return TRUE;
- ancestor = ancestor->parent;
+ Object *par;
+ for (par = child->parent; par; par = par->parent) {
+ if (par == ob) {
+ return TRUE;
+ }
}
return FALSE;
}
@@ -3151,16 +3149,16 @@
obrel_list_add(&links, ob);
}
else {
- if ( (objectSet == OB_SET_SELECTED && TESTBASELIB_BGMODE(((View3D *)NULL), scene, base))
- || (objectSet == OB_SET_VISIBLE && BASE_EDITABLE_BGMODE(((View3D *)NULL), scene, base))
- ) {
+ if ((objectSet == OB_SET_SELECTED && TESTBASELIB_BGMODE(((View3D *)NULL), scene, base)) ||
+ (objectSet == OB_SET_VISIBLE && BASE_EDITABLE_BGMODE(((View3D *)NULL), scene, base)))
+ {
Object *ob = base->object;
if (obrel_list_test(ob))
obrel_list_add(&links, ob);
/* parent relationship */
- if (includeFilter & ( OB_REL_PARENT | OB_REL_PARENT_RECURSIVE )) {
+ if (includeFilter & (OB_REL_PARENT | OB_REL_PARENT_RECURSIVE)) {
Object *parent = ob->parent;
if (obrel_list_test(parent)) {
@@ -3169,7 +3167,7 @@
/* recursive parent relationship */
if (includeFilter & OB_REL_PARENT_RECURSIVE) {
parent = parent->parent;
- while (obrel_list_test(parent)){
+ while (obrel_list_test(parent)) {
obrel_list_add(&links, parent);
parent = parent->parent;
@@ -3179,15 +3177,16 @@
}
/* child relationship */
- if (includeFilter & ( OB_REL_CHILDREN | OB_REL_CHILDREN_RECURSIVE )) {
+ if (includeFilter & (OB_REL_CHILDREN | OB_REL_CHILDREN_RECURSIVE)) {
Base *local_base;
for (local_base = scene->base.first; local_base; local_base = local_base->next) {
if (BASE_EDITABLE_BGMODE(((View3D *)NULL), scene, local_base)) {
Object *child = local_base->object;
if (obrel_list_test(child)) {
- if ((includeFilter & OB_REL_CHILDREN_RECURSIVE && obrel_is_recursive_child(ob,child))
- || (includeFilter & OB_REL_CHILDREN && child->parent && child->parent == ob )) {
+ if ((includeFilter & OB_REL_CHILDREN_RECURSIVE && obrel_is_recursive_child(ob, child)) ||
+ (includeFilter & OB_REL_CHILDREN && child->parent && child->parent == ob))
+ {
obrel_list_add(&links, child);
}
}
@@ -3206,7 +3205,7 @@
}
}
- } // end for
+ }
return links;
}
Modified: trunk/blender/source/blender/collada/AnimationExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/AnimationExporter.cpp 2012-06-12 21:32:41 UTC (rev 47807)
+++ trunk/blender/source/blender/collada/AnimationExporter.cpp 2012-06-12 22:05:33 UTC (rev 47808)
@@ -28,7 +28,7 @@
void forEachObjectInExportSet(Scene *sce, Functor &f, LinkNode *export_set)
{
LinkNode *node;
- for(node=export_set; node; node=node->next) {
+ for (node = export_set; node; node = node->next) {
Object *ob = (Object *)node->link;
f(ob);
}
@@ -48,7 +48,7 @@
}
// called for each exported object
-void AnimationExporter::operator() (Object *ob)
+void AnimationExporter::operator()(Object *ob)
{
FCurve *fcu;
char *transformName;
@@ -56,24 +56,24 @@
//Export transform animations
if (ob->adt && ob->adt->action) {
- fcu = (FCurve*)ob->adt->action->curves.first;
+ fcu = (FCurve *)ob->adt->action->curves.first;
//transform matrix export for bones are temporarily disabled here.
- if ( ob->type == OB_ARMATURE ) {
- bArmature *arm = (bArmature*)ob->data;
- for (Bone *bone = (Bone*)arm->bonebase.first; bone; bone = bone->next)
+ if (ob->type == OB_ARMATURE) {
+ bArmature *arm = (bArmature *)ob->data;
+ for (Bone *bone = (Bone *)arm->bonebase.first; bone; bone = bone->next)
write_bone_animation_matrix(ob, bone);
}
while (fcu) {
//for armature animations as objects
- if ( ob->type == OB_ARMATURE )
+ if (ob->type == OB_ARMATURE)
transformName = fcu->rna_path;
else
- transformName = extract_transform_name( fcu->rna_path );
+ transformName = extract_transform_name(fcu->rna_path);
if ((!strcmp(transformName, "location") || !strcmp(transformName, "scale")) ||
- (!strcmp(transformName, "rotation_euler") && ob->rotmode == ROT_MODE_EUL)||
+ (!strcmp(transformName, "rotation_euler") && ob->rotmode == ROT_MODE_EUL) ||
(!strcmp(transformName, "rotation_quaternion")))
{
dae_animation(ob, fcu, transformName, false);
@@ -84,12 +84,12 @@
}
//Export Lamp parameter animations
- if ( (ob->type == OB_LAMP ) && ((Lamp*)ob ->data)->adt && ((Lamp*)ob ->data)->adt->action ) {
- fcu = (FCurve*)(((Lamp*)ob ->data)->adt->action->curves.first);
+ if ( (ob->type == OB_LAMP) && ((Lamp *)ob->data)->adt && ((Lamp *)ob->data)->adt->action) {
+ fcu = (FCurve *)(((Lamp *)ob->data)->adt->action->curves.first);
while (fcu) {
- transformName = extract_transform_name( fcu->rna_path );
+ transformName = extract_transform_name(fcu->rna_path);
- if ((!strcmp(transformName, "color")) || (!strcmp(transformName, "spot_size"))||
+ if ((!strcmp(transformName, "color")) || (!strcmp(transformName, "spot_size")) ||
(!strcmp(transformName, "spot_blend")) || (!strcmp(transformName, "distance")))
{
dae_animation(ob, fcu, transformName, true);
@@ -99,14 +99,14 @@
}
//Export Camera parameter animations
- if ( (ob->type == OB_CAMERA ) && ((Camera*)ob ->data)->adt && ((Camera*)ob ->data)->adt->action ) {
- fcu = (FCurve*)(((Camera*)ob ->data)->adt->action->curves.first);
+ if ( (ob->type == OB_CAMERA) && ((Camera *)ob->data)->adt && ((Camera *)ob->data)->adt->action) {
+ fcu = (FCurve *)(((Camera *)ob->data)->adt->action->curves.first);
while (fcu) {
- transformName = extract_transform_name( fcu->rna_path );
+ transformName = extract_transform_name(fcu->rna_path);
- if ((!strcmp(transformName, "lens"))||
- (!strcmp(transformName, "ortho_scale"))||
- (!strcmp(transformName, "clip_end"))||(!strcmp(transformName, "clip_start")))
+ if ((!strcmp(transformName, "lens")) ||
+ (!strcmp(transformName, "ortho_scale")) ||
+ (!strcmp(transformName, "clip_end")) || (!strcmp(transformName, "clip_start")))
{
dae_animation(ob, fcu, transformName, true);
}
@@ -116,19 +116,19 @@
//Export Material parameter animations.
for (int a = 0; a < ob->totcol; a++) {
- Material *ma = give_current_material(ob, a+1);
+ Material *ma = give_current_material(ob, a + 1);
if (!ma) continue;
if (ma->adt && ma->adt->action) {
/* isMatAnim = true; */
- fcu = (FCurve*)ma->adt->action->curves.first;
+ fcu = (FCurve *)ma->adt->action->curves.first;
while (fcu) {
- transformName = extract_transform_name( fcu->rna_path );
+ transformName = extract_transform_name(fcu->rna_path);
- if ((!strcmp(transformName, "specular_hardness"))||(!strcmp(transformName, "specular_color")) ||
- (!strcmp(transformName, "diffuse_color"))||(!strcmp(transformName, "alpha")) ||
- (!strcmp(transformName, "ior")))
+ if ((!strcmp(transformName, "specular_hardness")) || (!strcmp(transformName, "specular_color")) ||
+ (!strcmp(transformName, "diffuse_color")) || (!strcmp(transformName, "alpha")) ||
+ (!strcmp(transformName, "ior")))
{
- dae_animation(ob, fcu, transformName, true, ma );
+ dae_animation(ob, fcu, transformName, true, ma);
}
fcu = fcu->next;
}
@@ -138,33 +138,33 @@
}
//euler sources from quternion sources
-float * AnimationExporter::get_eul_source_for_quat(Object *ob )
+float *AnimationExporter::get_eul_source_for_quat(Object *ob)
{
- FCurve *fcu = (FCurve*)ob->adt->action->curves.first;
+ FCurve *fcu = (FCurve *)ob->adt->action->curves.first;
const int keys = fcu->totvert;
- float *quat = (float*)MEM_callocN(sizeof(float) * fcu->totvert * 4, "quat output source values");
- float *eul = (float*)MEM_callocN(sizeof(float) * fcu->totvert * 3, "quat output source values");
+ float *quat = (float *)MEM_callocN(sizeof(float) * fcu->totvert * 4, "quat output source values");
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list