[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55377] trunk/blender/source/blender: code cleanup
Campbell Barton
ideasman42 at gmail.com
Mon Mar 18 19:25:06 CET 2013
Revision: 55377
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55377
Author: campbellbarton
Date: 2013-03-18 18:25:05 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
code cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_node.h
trunk/blender/source/blender/blenkernel/BKE_texture.h
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/texture.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/versioning_250.c
trunk/blender/source/blender/blenloader/intern/versioning_legacy.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/collada/MeshImporter.cpp
trunk/blender/source/blender/collada/SceneExporter.cpp
trunk/blender/source/blender/collada/collada_utils.cpp
trunk/blender/source/blender/compositor/nodes/COM_GroupNode.cpp
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/interface/view2d.c
trunk/blender/source/blender/editors/object/object_constraint.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_add.c
trunk/blender/source/blender/editors/space_node/node_buttons.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_node/node_group.c
trunk/blender/source/blender/editors/space_node/node_ops.c
trunk/blender/source/blender/editors/space_node/node_relationships.c
trunk/blender/source/blender/editors/space_node/node_select.c
trunk/blender/source/blender/editors/space_node/node_templates.c
trunk/blender/source/blender/editors/space_node/node_view.c
trunk/blender/source/blender/editors/space_node/space_node.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/makesrna/RNA_enum_types.h
trunk/blender/source/blender/makesrna/intern/rna_define.c
trunk/blender/source/blender/makesrna/intern/rna_material.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_texture.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/nodes/composite/node_composite_tree.c
trunk/blender/source/blender/nodes/composite/node_composite_util.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_brightness.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_common.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_composite.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_crop.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_despeckle.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_dilate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_displace.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_filter.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_flip.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_gamma.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_glare.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_idMask.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_invert.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_lensdist.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_levels.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mapRange.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mapUV.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mapValue.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_math.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_movieclip.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_normal.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_normalize.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_pixelate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_premulkey.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_rgb.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_rotate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_scale.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_setalpha.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_texture.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_tonemap.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_transform.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_translate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_value.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_viewer.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_zcombine.c
trunk/blender/source/blender/nodes/intern/node_common.c
trunk/blender/source/blender/nodes/intern/node_exec.c
trunk/blender/source/blender/nodes/intern/node_socket.c
trunk/blender/source/blender/nodes/shader/node_shader_tree.c
trunk/blender/source/blender/nodes/shader/node_shader_util.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_add_shader.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_attribute.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_background.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_brightness.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bump.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_camera.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_common.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_curves.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_emission.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_fresnel.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_gamma.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_geometry.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_hair_info.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_holdout.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_invert.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_light_path.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_mapping.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_material.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_math.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_normal.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_normal_map.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output_material.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output_world.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_rgb.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_script.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_squeeze.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tangent.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_image.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_texture.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_value.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_vectMath.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
trunk/blender/source/blender/nodes/texture/node_texture_tree.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_at.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_bricks.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_checker.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_common.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_compose.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_coord.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_curves.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_decompose.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_distance.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_image.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_invert.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_math.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_output.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_proc.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_rotate.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_scale.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_texture.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_translate.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_valToNor.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_viewer.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/blender/windowmanager/intern/wm_playanim.c
Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h 2013-03-18 17:24:47 UTC (rev 55376)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h 2013-03-18 18:25:05 UTC (rev 55377)
@@ -329,8 +329,8 @@
/* ************** GENERIC API, TREES *************** */
struct bNodeTreeType *ntreeTypeFind(const char *idname);
-void ntreeTypeAdd(struct bNodeTreeType* nt);
-void ntreeTypeFreeLink(struct bNodeTreeType* nt);
+void ntreeTypeAdd(struct bNodeTreeType *nt);
+void ntreeTypeFreeLink(struct bNodeTreeType *nt);
struct GHashIterator *ntreeTypeGetIterator(void);
/* helper macros for iterating over tree types */
@@ -405,8 +405,8 @@
/* ************** GENERIC API, NODES *************** */
struct bNodeType *nodeTypeFind(const char *idname);
-void nodeRegisterType(struct bNodeType* ntype);
-void nodeUnregisterType(struct bNodeType* ntype);
+void nodeRegisterType(struct bNodeType *ntype);
+void nodeUnregisterType(struct bNodeType *ntype);
struct GHashIterator *nodeTypeGetIterator(void);
/* helper macros for iterating over node types */
@@ -422,8 +422,8 @@
}
struct bNodeSocketType *nodeSocketTypeFind(const char *idname);
-void nodeRegisterSocketType(struct bNodeSocketType* stype);
-void nodeUnregisterSocketType(struct bNodeSocketType* stype);
+void nodeRegisterSocketType(struct bNodeSocketType *stype);
+void nodeUnregisterSocketType(struct bNodeSocketType *stype);
struct GHashIterator *nodeSocketTypeGetIterator(void);
const char * nodeStaticSocketType(int type, int subtype);
const char * nodeStaticSocketInterfaceType(int type, int subtype);
@@ -485,7 +485,7 @@
void nodeSetActive(struct bNodeTree *ntree, struct bNode *node);
struct bNode *nodeGetActive(struct bNodeTree *ntree);
struct bNode *nodeGetActiveID(struct bNodeTree *ntree, short idtype);
-int nodeSetActiveID(struct bNodeTree *ntree, short idtype, struct ID *id);
+bool nodeSetActiveID(struct bNodeTree *ntree, short idtype, struct ID *id);
void nodeClearActive(struct bNodeTree *ntree);
void nodeClearActiveID(struct bNodeTree *ntree, short idtype);
struct bNode *nodeGetActiveTexture(struct bNodeTree *ntree);
@@ -519,13 +519,13 @@
bNodeInstanceKey BKE_node_instance_key(bNodeInstanceKey parent_key, struct bNodeTree *ntree, struct bNode *node);
-bNodeInstanceHash * BKE_node_instance_hash_new(const char *info);
+bNodeInstanceHash *BKE_node_instance_hash_new(const char *info);
void BKE_node_instance_hash_free(bNodeInstanceHash *hash, bNodeInstanceValueFP valfreefp);
void BKE_node_instance_hash_insert(bNodeInstanceHash *hash, bNodeInstanceKey key, void *value);
-void* BKE_node_instance_hash_lookup(bNodeInstanceHash *hash, bNodeInstanceKey key);
+void *BKE_node_instance_hash_lookup(bNodeInstanceHash *hash, bNodeInstanceKey key);
int BKE_node_instance_hash_remove(bNodeInstanceHash *hash, bNodeInstanceKey key, bNodeInstanceValueFP valfreefp);
void BKE_node_instance_hash_clear(bNodeInstanceHash *hash, bNodeInstanceValueFP valfreefp);
-void* BKE_node_instance_hash_pop(bNodeInstanceHash *hash, bNodeInstanceKey key);
+void *BKE_node_instance_hash_pop(bNodeInstanceHash *hash, bNodeInstanceKey key);
int BKE_node_instance_hash_haskey(bNodeInstanceHash *hash, bNodeInstanceKey key);
int BKE_node_instance_hash_size(bNodeInstanceHash *hash);
@@ -540,7 +540,7 @@
BLI_INLINE void BKE_node_instance_hash_iterator_init(bNodeInstanceHashIterator *iter, bNodeInstanceHash *hash) { BLI_ghashIterator_init(iter, hash->ghash); }
BLI_INLINE void BKE_node_instance_hash_iterator_free(bNodeInstanceHashIterator *iter) { BLI_ghashIterator_free(iter); }
BLI_INLINE bNodeInstanceKey BKE_node_instance_hash_iterator_get_key(bNodeInstanceHashIterator *iter) { return *(bNodeInstanceKey *)BLI_ghashIterator_getKey(iter); }
-BLI_INLINE void* BKE_node_instance_hash_iterator_get_value(bNodeInstanceHashIterator *iter) { return BLI_ghashIterator_getValue(iter); }
+BLI_INLINE void *BKE_node_instance_hash_iterator_get_value(bNodeInstanceHashIterator *iter) { return BLI_ghashIterator_getValue(iter); }
BLI_INLINE void BKE_node_instance_hash_iterator_step(bNodeInstanceHashIterator *iter) { BLI_ghashIterator_step(iter); }
BLI_INLINE bool BKE_node_instance_hash_iterator_not_done(bNodeInstanceHashIterator *iter) { return BLI_ghashIterator_notDone(iter); }
@@ -553,8 +553,8 @@
/* Node Previews */
int BKE_node_preview_used(struct bNode *node);
-bNodePreview* BKE_node_preview_verify(struct bNodeInstanceHash *previews, bNodeInstanceKey key, int xsize, int ysize, int create);
-bNodePreview* BKE_node_preview_copy(struct bNodePreview *preview);
+bNodePreview *BKE_node_preview_verify(struct bNodeInstanceHash *previews, bNodeInstanceKey key, int xsize, int ysize, int create);
+bNodePreview *BKE_node_preview_copy(struct bNodePreview *preview);
void BKE_node_preview_free(struct bNodePreview *preview);
void BKE_node_preview_init_tree(struct bNodeTree *ntree, int xsize, int ysize, int create_previews);
void BKE_node_preview_free_tree(struct bNodeTree *ntree);
Modified: trunk/blender/source/blender/blenkernel/BKE_texture.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_texture.h 2013-03-18 17:24:47 UTC (rev 55376)
+++ trunk/blender/source/blender/blenkernel/BKE_texture.h 2013-03-18 18:25:05 UTC (rev 55377)
@@ -61,8 +61,8 @@
void BKE_texture_free(struct Tex *t);
-void init_colorband(struct ColorBand *coba, int rangetype);
-struct ColorBand *add_colorband(int rangetype);
+void init_colorband(struct ColorBand *coba, bool rangetype);
+struct ColorBand *add_colorband(bool rangetype);
int do_colorband(const struct ColorBand *coba, float in, float out[4]);
void colorband_table_RGBA(struct ColorBand *coba, float **array, int *size);
struct CBData *colorband_element_add(struct ColorBand *coba, float position);
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c 2013-03-18 17:24:47 UTC (rev 55376)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c 2013-03-18 18:25:05 UTC (rev 55377)
@@ -1152,7 +1152,7 @@
{
CBData *ramp;
- brush->paint_ramp = add_colorband(0);
+ brush->paint_ramp = add_colorband(false);
if (!brush->paint_ramp)
return 0;
ramp = brush->paint_ramp->data;
@@ -1168,7 +1168,7 @@
{
CBData *ramp;
- brush->vel_ramp = add_colorband(0);
+ brush->vel_ramp = add_colorband(false);
if (!brush->vel_ramp)
return 0;
ramp = brush->vel_ramp->data;
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2013-03-18 17:24:47 UTC (rev 55376)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2013-03-18 18:25:05 UTC (rev 55377)
@@ -2171,7 +2171,7 @@
}
else if (sa->spacetype == SPACE_NODE) {
SpaceNode *snode = sa->spacedata.first;
- if (snode->nodetree && snode->nodetree->type==NTREE_COMPOSIT) {
+ if (snode->nodetree && snode->nodetree->type == NTREE_COMPOSIT) {
bNode *node;
for (node = snode->nodetree->nodes.first; node; node = node->next) {
if (node->id && node->type == CMP_NODE_IMAGE) {
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2013-03-18 17:24:47 UTC (rev 55376)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2013-03-18 18:25:05 UTC (rev 55377)
@@ -205,29 +205,29 @@
ntree->init |= NTREE_TYPE_INIT;
- if (treetype && strcmp(ntree->idname, treetype->idname)==0)
+ if (treetype && STREQ(ntree->idname, treetype->idname))
ntree_set_typeinfo(ntree, unregister ? NULL : treetype);
/* initialize nodes */
- for (node=ntree->nodes.first; node; node=node->next) {
- if (nodetype && strcmp(node->idname, nodetype->idname)==0)
+ for (node = ntree->nodes.first; node; node = node->next) {
+ if (nodetype && STREQ(node->idname, nodetype->idname))
node_set_typeinfo(C, ntree, node, unregister ? NULL : nodetype);
/* initialize node sockets */
- for (sock=node->inputs.first; sock; sock=sock->next)
- if (socktype && strcmp(sock->idname, socktype->idname)==0)
+ for (sock = node->inputs.first; sock; sock = sock->next)
+ if (socktype && STREQ(sock->idname, socktype->idname))
node_socket_set_typeinfo(ntree, sock, unregister ? NULL : socktype);
- for (sock=node->outputs.first; sock; sock=sock->next)
- if (socktype && strcmp(sock->idname, socktype->idname)==0)
+ for (sock = node->outputs.first; sock; sock = sock->next)
+ if (socktype && STREQ(sock->idname, socktype->idname))
node_socket_set_typeinfo(ntree, sock, unregister ? NULL : socktype);
}
/* initialize tree sockets */
- for (sock=ntree->inputs.first; sock; sock=sock->next)
- if (socktype && strcmp(sock->idname, socktype->idname)==0)
+ for (sock = ntree->inputs.first; sock; sock = sock->next)
+ if (socktype && STREQ(sock->idname, socktype->idname))
node_socket_set_typeinfo(ntree, sock, unregister ? NULL : socktype);
- for (sock=ntree->outputs.first; sock; sock=sock->next)
- if (socktype && strcmp(sock->idname, socktype->idname)==0)
+ for (sock = ntree->outputs.first; sock; sock = sock->next)
+ if (socktype && STREQ(sock->idname, socktype->idname))
node_socket_set_typeinfo(ntree, sock, unregister ? NULL : socktype);
}
FOREACH_NODETREE_END
@@ -250,37 +250,37 @@
for (node = ntree->nodes.first; node; node = node->next) {
node_set_typeinfo(C, ntree, node, nodeTypeFind(node->idname));
- for (sock=node->inputs.first; sock; sock=sock->next)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list