style cleanup: whitespace/indentation
authorCampbell Barton <ideasman42@gmail.com>
Sat, 19 May 2012 13:55:54 +0000 (13:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 19 May 2012 13:55:54 +0000 (13:55 +0000)
44 files changed:
CMakeLists.txt
source/blender/avi/intern/avirgb.c
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/font.c
source/blender/blenlib/intern/BLI_kdopbvh.c
source/blender/blenlib/intern/fnmatch.c
source/blender/blenlib/intern/path_util.c
source/blender/blenlib/intern/winstuff.c
source/blender/compositor/operations/COM_MapUVOperation.h
source/blender/compositor/operations/COM_OpenCLKernels.cl
source/blender/compositor/operations/COM_OpenCLKernels.cl.cpp
source/blender/editors/animation/anim_draw.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/editarmature_retarget.c
source/blender/editors/armature/poseobject.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/interface/view2d.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_userpref/space_userpref.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_input.c
source/blender/editors/transform/transform_snap.c
source/blender/imbuf/intern/filetype.c
source/blender/imbuf/intern/filter.c
source/blender/imbuf/intern/tiff.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_mask.c
source/blender/modifiers/intern/MOD_screw.c
source/blender/nodes/composite/nodes/node_composite_blur.c
source/blender/nodes/composite/nodes/node_composite_defocus.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/render_texture.c
source/blender/render/intern/source/shadeoutput.c
source/blender/windowmanager/intern/wm_gesture.c
source/creator/creator.c

index 69812be1e50fec6268e705a6c72b7d846da0b9f5..4f86aa0d7f2b698dea2f5d01d17f177165af67ec 100644 (file)
@@ -103,8 +103,8 @@ enable_testing()
 #-----------------------------------------------------------------------------
 # Redirect output files
 
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE )
-set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE )
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE)
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE)
 
 #-----------------------------------------------------------------------------
 # Set default config options
@@ -1187,13 +1187,13 @@ elseif(APPLE)
        endif()
 
        if(${XCODE_VERSION} VERSION_LESS 4.3)
-               SET(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE ) # use guaranteed existing sdk
+               set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE)  # use guaranteed existing sdk
        else()
                # note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
                # absolute pathes are more foolproof here !
-               SET(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
-               SET(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
-               SET(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
+               set(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
+               set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
+               set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
        endif() 
        
        if(WITH_LIBS10.5)
@@ -1365,7 +1365,7 @@ elseif(APPLE)
                )
 
                set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
-               set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa" )
+               set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa")
                #pcre is bundled with openCollada
                #set(PCRE ${LIBDIR}/pcre)
                #set(PCRE_LIBPATH ${PCRE}/lib)
index 78316990d54c44252ad9ba2be418b04895fee3d1..7a95972845a5b6a1b67b10fb7944aa78b2807abc 100644 (file)
@@ -59,7 +59,7 @@ void *avi_converter_from_avi_rgb(AviMovie *movie, int stream, unsigned char *buf
                unsigned char *to;
 #ifdef __BIG_ENDIAN__
                unsigned char  *pxla;
-#endif           
+#endif
                
                buf = MEM_mallocN(movie->header->Height * movie->header->Width * 3, "fromavirgbbuf");
 
index 0f8716e2b04f0401dedfa274a3c6f91a7bc87b38..233647c9ec6598aadeca60e79eb239da06b432f8 100644 (file)
@@ -247,7 +247,7 @@ void set_active_action_group(bAction *act, bActionGroup *agrp, short select)
        for (grp = act->groups.first; grp; grp = grp->next) {
                if ((grp == agrp) && (select))
                        grp->flag |= AGRP_ACTIVE;
-               else    
+               else
                        grp->flag &= ~AGRP_ACTIVE;
        }
 }
@@ -958,7 +958,7 @@ short action_get_item_transforms(bAction *act, Object *ob, bPoseChannel *pchan,
                RNA_pointer_create((ID *)ob, &RNA_PoseBone, pchan, &ptr);
        else if (ob)
                RNA_id_pointer_create((ID *)ob, &ptr);
-       else    
+       else
                return 0;
                
        /* get the basic path to the properties of interest */
index 6198a119ac4d0cefa745c055414665d94436fecd..f73221066b14d3579fdc086fe6e019de44c4cb82 100644 (file)
@@ -452,7 +452,7 @@ void animviz_calc_motionpaths(Scene *scene, ListBase *targets)
                /* get pointer to animviz settings for each target */
                if (mpt->pchan)
                        avs = &mpt->ob->pose->avs;
-               else    
+               else
                        avs = &mpt->ob->avs;
                
                /* clear the flag requesting recalculation of targets */
index cc49652d6e502b4a73fe199b07b1de5eb7ff1b95..65294e3e5f56aa736338e468bc47dfdc8ff235fd 100644 (file)
@@ -636,9 +636,9 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
                        else {
                                if (index) {
                                        orig = *index++;
-                                       if (orig == ORIGINDEX_NONE)     { if (nors) nors += 3; continue; }
-                                       if (drawParamsMapped) draw_option = drawParamsMapped(userData, orig);
-                                       else {    if (nors) nors += 3; continue; }
+                                       if (orig == ORIGINDEX_NONE) { if (nors) nors += 3; continue; }
+                                       if (drawParamsMapped)       { draw_option = drawParamsMapped(userData, orig); }
+                                       else                        { if (nors) nors += 3; continue; }
                                }
                                else
                                if (drawParamsMapped) draw_option = drawParamsMapped(userData, i);
index d526ce7afdc044a7392d767d3793a763ec45ed58..f8b8efdf7eb534f0788748c5dc42bc88ee0a1886 100644 (file)
@@ -575,16 +575,16 @@ static int surface_getBrushFlags(DynamicPaintSurface *surface, Scene *scene)
                brushObj = NULL;
 
                /* select object */
-               if (surface->brush_group) {                                             
+               if (surface->brush_group) {
                        if (go->ob) brushObj = go->ob;
-               }                                       
-               else                                            
+               }
+               else
                        brushObj = base->object;
 
                if (!brushObj) {
                        if (surface->brush_group) go = go->next;
                        else base = base->next;
-                       continue;                       
+                       continue;
                }
 
                if (surface->brush_group)
@@ -3569,7 +3569,7 @@ static int dynamicPaint_paintParticles(DynamicPaintSurface *surface,
        tree = BLI_kdtree_new(psys->totpart);
 
        /* loop through particles and insert valid ones to the tree     */
-       for (p = 0, pa = psys->particles; p < psys->totpart; p++, pa++)   {
+       for (p = 0, pa = psys->particles; p < psys->totpart; p++, pa++) {
 
                /* Proceed only if particle is active   */
                if (pa->alive == PARS_UNBORN && (part->flag & PART_UNBORN) == 0) continue;
@@ -4805,17 +4805,17 @@ static int dynamicPaint_doStep(Scene *scene, Object *ob, DynamicPaintSurface *su
                while (base || go) {
                        brushObj = NULL;
                        /* select object */
-                       if (surface->brush_group) {                                             
+                       if (surface->brush_group) {
                                if (go->ob) brushObj = go->ob;
-                       }                                       
-                       else                                            
+                       }
+                       else
                                brushObj = base->object;
 
-                       if (!brushObj) {                        
+                       if (!brushObj) {
                                /* skip item */
                                if (surface->brush_group) go = go->next;
                                else base = base->next;
-                               continue;                       
+                               continue;
                        }
 
                        /* next item */
index 07c5d6d032954d7ad5d9d668e3d1cf81e4bc9778..87e35bc2747bfbde2eca3e97f4b9037374ccfa88 100644 (file)
@@ -634,7 +634,7 @@ makebreak:
                 * But if the font is FO_BUILTIN_NAME then do not try loading since
                 * whole font is in the memory already
                 */
-               if (che == NULL && strcmp(vfont->name, FO_BUILTIN_NAME))    {
+               if (che == NULL && strcmp(vfont->name, FO_BUILTIN_NAME)) {
                        BLI_vfontchar_from_freetypefont(vfont, ascii);
                }
 
index 2b21758fdc11516de6f62327ecbf470d04c3688c..e9ee91505de978b6176029781fe8c41287f9c760 100644 (file)
@@ -438,7 +438,7 @@ static char get_largest_axis(float *bv)
        middle_point[0] = (bv[1]) - (bv[0]); // x axis
        middle_point[1] = (bv[3]) - (bv[2]); // y axis
        middle_point[2] = (bv[5]) - (bv[4]); // z axis
-       if (middle_point[0] > middle_point[1])  {
+       if (middle_point[0] > middle_point[1]) {
                if (middle_point[0] > middle_point[2])
                        return 1;  // max x axis
                else
@@ -464,7 +464,7 @@ static void node_join(BVHTree *tree, BVHNode *node)
        }
        
        for (i = 0; i < tree->tree_type; i++) {
-               if (node->children[i])  {
+               if (node->children[i]) {
                        for (j = tree->start_axis; j < tree->stop_axis; j++) {
                                // update minimum 
                                if (node->children[i]->bv[(2 * j)] < node->bv[(2 * j)]) 
index 53172957560a387a978c229b43cb2c7dd8c22103..e29f31897c02324da867f47352c43a24f10359fd 100644 (file)
@@ -235,7 +235,7 @@ fnmatch (const char *pattern, const char *string, int flags)
 # undef FOLD
 }
 
-#endif /* _LIBC or not __GNU_LIBRARY__.  */
+#endif /* _LIBC or not __GNU_LIBRARY__.  */
 
 #else
 
index 59147040fd86e1495ac1646683d74c0779ab1fe2..49a6cbcc249ebc543f6d5231b57f4d5765b4158c 100644 (file)
@@ -1920,7 +1920,7 @@ static void BLI_where_is_temp(char *fullname, const size_t maxlen, char *userdir
                        BLI_strncpy(fullname, tmp, maxlen);
                }
        }
-#endif 
+#endif
        
        if (fullname[0] == '\0') {
                BLI_strncpy(fullname, "/tmp/", maxlen);
index efb5ca98185e8bd62fa53b740be1b6d9a0b07a22..e34150ee4f21251cfe21d186ce849185c07cd8c0 100644 (file)
@@ -158,7 +158,7 @@ void RegisterBlendExtension(void)
                ThumbHandlerDLL = "BlendThumb64.dll";
        else
                ThumbHandlerDLL = "BlendThumb.dll";
-#endif 
+#endif
        snprintf(RegCmd, MAX_PATH * 2, "%s\\regsvr32 /s \"%s\\%s\"", SysDir, InstallDir, ThumbHandlerDLL);
        system(RegCmd);
 
index 069f454895d1567b8e7c6b70fcf8a870d4915784..4d7bc814dc277f015ce666bee1022d8448f312b5 100644 (file)
@@ -57,6 +57,6 @@ public:
         */
        void deinitExecution();
 
-       void setAlpha(float alpha){this->alpha = alpha;}
+       void setAlpha(float alpha) { this->alpha = alpha; }
 };
 #endif
index d462f5d82506a6a7c9e0744f0104569af3ea9184..40932e54bc7e20432b8db77c3e429014e44b2178 100644 (file)
@@ -1,6 +1,7 @@
 /// This file contains all opencl kernels for node-operation implementations 
 
-__kernel void testKernel(__global __write_only image2d_t output){
+__kernel void testKernel(__global __write_only image2d_t output)
+{
        int x = get_global_id(0);
        int y = get_global_id(1);
        int2 coords = {x, y}; 
index 66db4a1c86b5bcc279d8d4e8eda96abc328a2fdf..1024d4600443fc00d0be36236158a35ce6133a3e 100644 (file)
@@ -3,7 +3,8 @@
 
 const char *sourcecode = "/// This file contains all opencl kernels for node-operation implementations \n" \
 "\n" \
-"__kernel void testKernel(__global __write_only image2d_t output) {\n" \
+"__kernel void testKernel(__global __write_only image2d_t output)\n" \
+"{\n" \
 "      int x = get_global_id(0);\n" \
 "      int y = get_global_id(1);\n" \
 "      int2 coords = {x, y}; \n" \
index 0514700e120380bb0397a1a3e501af10ea41dfd0..ddc4f4d943c06edbd377d4877476b5ef94fde193 100644 (file)
@@ -191,7 +191,7 @@ static void draw_cfra_number(Scene *scene, View2D *v2d, float cfra, short time)
         */
        if (time)
                ANIM_timecode_string_from_frame(&numstr[4], scene, 0, time, FRA2TIME(cfra));
-       else    
+       else
                ANIM_timecode_string_from_frame(&numstr[4], scene, 1, time, cfra);
        slen = (short)UI_GetStringWidth(numstr) - 1;
        
index ac5af846900deca25330bcc7a2b4d5c9599bbdce..546ab0e4396fac4fe19b2cfbf5785535f86ad834 100644 (file)
@@ -3653,7 +3653,7 @@ static int armature_switch_direction_exec(bContext *C, wmOperator *UNUSED(op))
                                ebo->parent = child;
                                if ((child) && equals_v3v3(ebo->head, child->tail))
                                        ebo->flag |= BONE_CONNECTED;
-                               else    
+                               else
                                        ebo->flag &= ~BONE_CONNECTED;
                                
                                /* get next bones 
index 80f8c61694c2af8b673f1fca072a29b9b2c53ace..d90bd96a6f18f3cd61d3282ee19f81fda72b805e 100644 (file)
@@ -733,7 +733,7 @@ static void RIG_reconnectControlBones(RigGraph *rg)
                
                /* DO SOME MAGIC HERE */
                for (pchan = rg->ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-                       for (con = pchan->constraints.first; con; con = con->next)  {
+                       for (con = pchan->constraints.first; con; con = con->next) {
                                bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
                                ListBase targets = {NULL, NULL};
                                bConstraintTarget *ct;
@@ -858,7 +858,7 @@ static void RIG_reconnectControlBones(RigGraph *rg)
                                
                                /* DO SOME MAGIC HERE */
                                for (pchan = rg->ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-                                       for (con = pchan->constraints.first; con; con = con->next)  {
+                                       for (con = pchan->constraints.first; con; con = con->next) {
                                                bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
                                                ListBase targets = {NULL, NULL};
                                                bConstraintTarget *ct;
index f18fa2f8bf800222ccad99b535643218525da053..df970171a54318e92b27d44bcf54bfff40d84791 100644 (file)
@@ -1136,7 +1136,7 @@ static bPoseChannel *pose_bone_do_paste(Object *ob, bPoseChannel *chan, short se
                        /* quat/euler to axis angle */
                        if (chan->rotmode > 0)
                                eulO_to_axis_angle(pchan->rotAxis, &pchan->rotAngle, chan->eul, chan->rotmode);
-                       else    
+                       else
                                quat_to_axis_angle(pchan->rotAxis, &pchan->rotAngle, chan->quat);
                }
                else {
index 5c23aba9024eab96b321f410eb0c497e45257129..6ffe3f1feebf2f7da641ef002b596311534d25e2 100644 (file)
@@ -214,7 +214,7 @@ static void gp_get_3d_reference(tGPsdata *p, float vec[3])
                sub_v3_v3v3(vec, fp, ob->loc);
        }
        else
-#endif 
+#endif
        {
                /* use 3D-cursor */
                copy_v3_v3(vec, fp);
index 2eea7f50f333ed3293d2a7b6b1f6753531be4a9a..1d315e9a5b8e390cad0b94cb818fd5782607e9e4 100644 (file)
@@ -1442,7 +1442,7 @@ View2DScrollers *UI_view2d_scrollers_calc(const bContext *C, View2D *v2d, short
                                v2d->scroll |= V2D_SCROLL_HORIZONTAL_FULLR;
                                scrollers->horfull = 1;
                        }
-                       else    
+                       else
                                v2d->scroll &= ~V2D_SCROLL_HORIZONTAL_FULLR;
                }
        }
@@ -1484,7 +1484,7 @@ View2DScrollers *UI_view2d_scrollers_calc(const bContext *C, View2D *v2d, short
                                v2d->scroll |= V2D_SCROLL_VERTICAL_FULLR;
                                scrollers->vertfull = 1;
                        }
-                       else    
+                       else
                                v2d->scroll &= ~V2D_SCROLL_VERTICAL_FULLR;
                }
        }
index d9d5852eb6d0490235601185fd6732f6bc4a9d89..c8ca75835e48c2e0df967a29478ff2e114e54179 100644 (file)
@@ -540,7 +540,7 @@ static void export_fluid_objects(ListBase *fobjects, Scene *scene, int length)
                fsmesh.volumeInitType = fluidmd->fss->volumeInitType;
                fsmesh.obstacleImpactFactor = fluidmd->fss->surfaceSmoothing; // misused value
                
-               if (fsmesh.type == OB_FLUIDSIM_CONTROL) {
+               if (fsmesh.type == OB_FLUIDSIM_CONTROL) {
                        fsmesh.cpsTimeStart = fluidmd->fss->cpsTimeStart;
                        fsmesh.cpsTimeEnd = fluidmd->fss->cpsTimeEnd;
                        fsmesh.cpsQuality = fluidmd->fss->cpsQuality;
@@ -708,7 +708,7 @@ static int fluid_init_filepaths(Object *fsDomain, char *targetDir, char *targetF
                strncpy(domainSettings->surfdataPath, newSurfdataPath, FILE_MAXDIR);
                BLI_path_abs(targetDir, G.main->name); // fixed #frame-no 
        }
-#endif 
+#endif
        return outStringsChanged;
 }
 
index 9629fd7da0c5e7f62c781d8a296da2557ddb866a..4bb5a21cb3d467e4580cd3b4705582d15b1953dc 100644 (file)
@@ -241,7 +241,7 @@ static int file_border_select_modal(bContext *C, wmOperator *op, wmEvent *event)
 
        result= WM_border_select_modal(C, op, event);
 
-       if (result==OPERATOR_RUNNING_MODAL)     {
+       if (result == OPERATOR_RUNNING_MODAL) {
 
                rect.xmin = RNA_int_get(op->ptr, "xmin");
                rect.ymin = RNA_int_get(op->ptr, "ymin");
index 096c16298e3fff416ec4a3cd7bdc920b1f7f6bcc..a6578ffb3f73615286d044b267f4123e29775f38 100644 (file)
@@ -695,7 +695,7 @@ static void draw_nla_channel_list_gl(bAnimContext *ac, ListBase *anim_data, View
                                        if (((nlt->flag & NLATRACK_ACTIVE) && (nlt->flag & NLATRACK_DISABLED)) == 0) {
                                                if (nlt->flag & NLATRACK_MUTED)
                                                        mute = ICON_MUTE_IPO_ON;
-                                               else    
+                                               else
                                                        mute = ICON_MUTE_IPO_OFF;
                                                        
                                                if (EDITABLE_NLT(nlt))
index 6c683eba085d7bf5f48982df02bf20444701b31f..248f73b9ab6a708595d7ea2f8be0c22eb7fab3a8 100644 (file)
@@ -149,7 +149,7 @@ static void userpref_header_listener(ARegion *UNUSED(ar), wmNotifier *UNUSED(wmn
                default:
                        break;
        }
-#endif 
+#endif
 }
 
 /* only called once, from space/spacetypes.c */
index f18ba29b1f4f6d3bd2dc7ee604152d50ff5659c1..f63116a1f60aea5d690d0dfd774023482ebb4f84 100644 (file)
@@ -3005,7 +3005,7 @@ static void view3d_main_area_draw_info(const bContext *C, ARegion *ar, const cha
        
        if (U.uiflag & USER_SHOW_ROTVIEWICON)
                draw_view_axis(rv3d);
-       else    
+       else
                draw_view_icon(rv3d);
        
        ob = OBACT;
index 4573e66ca390439e149214312e3cceabf9db5536..b0a4f5bbfdea69b208e52ca44dfcb89af9c21f86 100644 (file)
@@ -2311,8 +2311,8 @@ int handleEventWarp(TransInfo *t, wmEvent *event)
        
        if (event->type == MIDDLEMOUSE && event->val == KM_PRESS) {
                // Use customData pointer to signal warp direction
-               if      (t->customData == NULL)
-                       t->customData = (void*)1;
+               if (t->customData == NULL)
+                       t->customData = (void *)1;
                else
                        t->customData = NULL;
                
@@ -2451,7 +2451,7 @@ int handleEventShear(TransInfo *t, wmEvent *event)
        
        if (event->type == MIDDLEMOUSE && event->val == KM_PRESS) {
                // Use customData pointer to signal Shear direction
-               if      (t->customData == NULL) {
+               if (t->customData == NULL) {
                        initMouseInputMode(t, &t->mouse, INPUT_VERTICAL_ABSOLUTE);
                        t->customData = (void*)1;
                }
index dad1c65298a8a69793e03c573ba1004c8fff2860..4d20346f79d256516bdffed492a70baaf6c371bb 100644 (file)
@@ -3757,42 +3757,42 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
 
                /* *** Extend Transform *** */
 
-               Scene * scene= t->scene;
+               Scene *scene = t->scene;
                int cfra= CFRA;
                int left= seq_tx_get_final_left(seq, 1);
                int right= seq_tx_get_final_right(seq, 1);
 
                if (seq->depth == 0 && ((seq->flag & SELECT) == 0 || (seq->flag & SEQ_LOCK))) {
-                       *recursive= 0;
-                       *count= 0;
-                       *flag= 0;
+                       *recursive = FALSE;
+                       *count = 0;
+                       *flag = 0;
                }
-               else if (seq->type ==SEQ_META) {
+               else if (seq->type == SEQ_META) {
 
                        /* for meta's we only ever need to extend their children, no matter what depth
                         * just check the meta's are in the bounds */
-                       if (t->frame_side=='R' && right <= cfra)                *recursive= 0;
-                       else if (t->frame_side=='L' && left >= cfra)    *recursive= 0;
-                       else                                                                                    *recursive= 1;
+                       if      (t->frame_side=='R' && right <= cfra)  *recursive = FALSE;
+                       else if (t->frame_side=='L' && left  >= cfra)  *recursive = FALSE;
+                       else                                           *recursive = TRUE;
 
                        *count= 1;
                        *flag= (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
                }
                else {
 
-                       *recursive= 0;  /* not a meta, so no thinking here */
-                       *count= 1;              /* unless its set to 0, extend will never set 2 handles at once */
-                       *flag= (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
+                       *recursive = FALSE;  /* not a meta, so no thinking here */
+                       *count = 1;          /* unless its set to 0, extend will never set 2 handles at once */
+                       *flag = (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
 
                        if (t->frame_side=='R') {
-                               if (right <= cfra)              *count= *flag= 0;       /* ignore */
-                               else if (left > cfra)   ;       /* keep the selection */
-                               else                                    *flag |= SEQ_RIGHTSEL;
+                               if      (right <= cfra) *count = *flag= 0;  /* ignore */
+                               else if (left   > cfra) ;                  /* keep the selection */
+                               else                    *flag |= SEQ_RIGHTSEL;
                        }
                        else {
-                               if (left >= cfra)               *count= *flag= 0;       /* ignore */
-                               else if (right < cfra)  ;       /* keep the selection */
-                               else                                    *flag |= SEQ_LEFTSEL;
+                               if      (left >= cfra)  *count = *flag= 0;  /* ignore */
+                               else if (right < cfra)  ;                  /* keep the selection */
+                               else                    *flag |= SEQ_LEFTSEL;
                        }
                }
        }
@@ -3808,9 +3808,9 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
 
                        /* Non nested strips (resect selection and handles) */
                        if ((seq->flag & SELECT) == 0 || (seq->flag & SEQ_LOCK)) {
-                               *recursive= 0;
-                               *count= 0;
-                               *flag= 0;
+                               *recursive = FALSE;
+                               *count = 0;
+                               *flag = 0;
                        }
                        else {
                                if ((seq->flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL)) == (SEQ_LEFTSEL|SEQ_RIGHTSEL)) {
@@ -3826,10 +3826,10 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
 
                                if ((seq->type == SEQ_META) && ((seq->flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL)) == 0)) {
                                        /* if any handles are selected, don't recurse */
-                                       *recursive = 1;
+                                       *recursive = TRUE;
                                }
                                else {
-                                       *recursive = 0;
+                                       *recursive = FALSE;
                                }
                        }
                }
@@ -3837,9 +3837,9 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
                        /* Nested, different rules apply */
 
 #ifdef SEQ_TX_NESTED_METAS
-                       *flag= (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
-                       *count= 1; /* ignore the selection for nested */
-                       *recursive = (seq->type == SEQ_META     );
+                       *flag = (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
+                       *count = 1; /* ignore the selection for nested */
+                       *recursive = (seq->type == SEQ_META);
 #else
                        if (seq->type == SEQ_META) {
                                /* Meta's can only directly be moved between channels since they
@@ -3848,12 +3848,12 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
                                 * calc_sequence() will update its settings when run on the toplevel meta */
                                *flag= 0;
                                *count= 0;
-                               *recursive = 1;
+                               *recursive = TRUE;
                        }
                        else {
                                *flag= (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
                                *count= 1; /* ignore the selection for nested */
-                               *recursive = 0;
+                               *recursive = FALSE;
                        }
 #endif
                }
@@ -4131,9 +4131,9 @@ static void freeSeqData(TransInfo *t)
                        for (seq= seqbasep->first; seq; seq= seq->next) {
                                /* We might want to build a list of effects that need to be updated during transform */
                                if (seq->type & SEQ_EFFECT) {
-                                       if              (seq->seq1 && seq->seq1->flag & SELECT) calc_sequence(t->scene, seq);
-                                       else if (seq->seq2 && seq->seq2->flag & SELECT) calc_sequence(t->scene, seq);
-                                       else if (seq->seq3 && seq->seq3->flag & SELECT) calc_sequence(t->scene, seq);
+                                       if      (seq->seq1 && seq->seq1->flag & SELECT) calc_sequence(t->scene, seq);
+                                       else if (seq->seq2 && seq->seq2->flag & SELECT) calc_sequence(t->scene, seq);
+                                       else if (seq->seq3 && seq->seq3->flag & SELECT) calc_sequence(t->scene, seq);
                                }
                        }
 
index a9179f95d4ee6f2570767462a8290456bcb1c4d4..23c1fba6107685c38e4dc8a8812b7a86160b77af 100644 (file)
@@ -1606,7 +1606,7 @@ void calculatePropRatio(TransInfo *t)
                                td->factor = 0.0f;
                                restoreElement(td);
                        }
-                       else if ((connected && (td->flag & TD_NOTCONNECTED || td->dist > t->prop_size)) ||
+                       else if ((connected && (td->flag & TD_NOTCONNECTED || td->dist > t->prop_size)) ||
                                 (connected == 0 && td->rdist > t->prop_size))
                        {
                                /*
index b25c76fe193085081bab10d54d130b645c98cd3c..5d5142740cb176b4482d654c75e4dcb46cf0231e 100644 (file)
@@ -87,8 +87,8 @@ static void InputSpringFlip(TransInfo *t, MouseInput *mi, const int mval[2], flo
 
        /* flip scale */
        /* values can become really big when zoomed in so use longs [#26598] */
-       if      ((long long int)(mi->center[0] - mval[0]) * (long long int)(mi->center[0] - mi->imval[0]) +
-                (long long int)(mi->center[1] - mval[1]) * (long long int)(mi->center[1] - mi->imval[1]) < 0)
+       if ((long long int)(mi->center[0] - mval[0]) * (long long int)(mi->center[0] - mi->imval[0]) +
+               (long long int)(mi->center[1] - mval[1]) * (long long int)(mi->center[1] - mi->imval[1]) < 0)
         {
                output[0] *= -1.0f;
         }
index b875886e80a09ee8bc465d893f4c47fe10508129..75d5efca21f51b75a5f83e384a01bc824581d395 100644 (file)
@@ -689,7 +689,7 @@ static float RotationBetween(TransInfo *t, float p1[3], float p2[3])
                
                if (dot_v3v3(tmp, axis) < 0.0f)
                        angle = -acos(dot_v3v3(start, end));
-               else    
+               else
                        angle = acos(dot_v3v3(start, end));
        }
        else {
index da207c19695aab35132213ed1814ff0e090a97b4..900bc7756f04da3a3e58e8befb6629d75794526b 100644 (file)
@@ -100,7 +100,7 @@ ImFileType IMB_FILE_TYPES[] = {
 #endif
 #ifdef WITH_QUICKTIME
        {quicktime_init, quicktime_exit, imb_is_a_quicktime, imb_ftype_quicktime, imb_quicktime_decode, NULL, NULL, 0, QUICKTIME},
-#endif 
+#endif
        {NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0}
 };
        
index e744851a9b68c15e27215f19b6aa074b12f02111..30142e5f5d5fe4b2bb87998243eb6d6704508ea3 100644 (file)
@@ -407,7 +407,7 @@ void IMB_filter_extend(struct ImBuf *ibuf, char *mask, int filter)
                                                                if (i != 0 || j != 0) {
                                                                        const int tmpindex = filter_make_index(x + i, y + j, width, height);
 
-                                                                       if (check_pixel_assigned(srcbuf, srcmask, tmpindex, depth, is_float))   {
+                                                                       if (check_pixel_assigned(srcbuf, srcmask, tmpindex, depth, is_float)) {
                                                                                if (is_float) {
                                                                                        for (c = 0; c < depth; c++)
                                                                                                tmp[c] = ((const float *) srcbuf)[depth * tmpindex + c];
index 0c6a5b56a3e293062a0512e4c57d5c141ba5b7e1..2178b6a4155094b8408a4881976922d10e2872a3 100644 (file)
@@ -478,7 +478,7 @@ static int imb_read_tiff_pixels(ImBuf *ibuf, TIFF *image, int premul)
                /* assign rect last */
                if (tmpibuf->rect_float)
                        ibuf->rect_float = tmpibuf->rect_float;
-               else    
+               else
                        ibuf->rect = tmpibuf->rect;
                ibuf->mall |= ib_flag;
                ibuf->flags |= ib_flag;
index 4c16239f13707a4df21e6110fa6b5d7f0ed89a64..1f5ac24db92edb121f5e1aeac28cdeecd78c70c5 100644 (file)
@@ -3640,7 +3640,7 @@ static void rna_def_node_socket_subtype(BlenderRNA *brna, int type, int subtype,
        PropertyRNA *prop = NULL;
        PropertySubType propsubtype = PROP_NONE;
        
-       #define SUBTYPE(socktype, stypename, id, idname)        { PROP_##id, #socktype "_" #id, 0, #idname, ""},
+       #define SUBTYPE(socktype, stypename, id, idname) { PROP_##id, #socktype "_" #id, 0, #idname, ""},
        static EnumPropertyItem subtype_items[] = {
                NODE_DEFINE_SUBTYPES
                {0, NULL, 0, NULL, NULL}
index a3169bdba46cf0c287de31b4be15d59a574ab11c..609d70b6e985f25ee77eed579ed76e3eb5bdd434 100644 (file)
@@ -71,7 +71,7 @@ static void freeData(ModifierData *md)
 {
        CollisionModifierData *collmd = (CollisionModifierData *) md;
        
-       if (collmd)  {
+       if (collmd) {
                if (collmd->bvhtree)
                        BLI_bvhtree_free(collmd->bvhtree);
                if (collmd->x)
index 5206aa281f7178a44d6d0d3c39835ebc1552b83d..0a14b4d5a088ad1b8dc832c8fee2a2e20538fe7c 100644 (file)
@@ -273,7 +273,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
        /* loop over edges and faces, and do the same thing to 
         * ensure that they only reference existing verts 
         */
-       for (i = 0; i < maxEdges; i++)  {
+       for (i = 0; i < maxEdges; i++) {
                MEdge me;
                dm->getEdge(dm, i, &me);
                
index f45cc9c2adeda797540a8df8eb5c2e8978970291..ce95f9bec6ef359181f2c49ac0ea0696886a9ede 100644 (file)
@@ -94,7 +94,7 @@ static void screwvert_iter_step(ScrewVertIter *iter)
                iter->v_other = iter->v;
                iter->v = iter->v_poin->v[0];
        }
-       if (iter->v >= 0)   {
+       if (iter->v >= 0) {
                iter->v_poin = &iter->v_array[iter->v];
                iter->e = iter->v_poin->e[(iter->v_poin->e[0] == iter->e)];
        }
index 77b62938d9458e684ffc5006aaa1657fab3c1a15..d19ea3f202fa2882b1af8f858661d798352e2b5e 100644 (file)
@@ -699,7 +699,7 @@ static void node_composit_exec_blur(void *data, bNode *node, bNodeStack **in, bN
                                        bokeh_single_image(node, new, gammabuf, in[1]->vec[0]);
                                else if (1)
                                        blur_single_image(node, new, gammabuf, in[1]->vec[0]);
-                               else    /* bloom experimental... */
+                               else  /* bloom experimental... */
                                        bloom_with_reference(new, gammabuf, NULL, in[1]->vec[0], nbd);
                                
                                if (nbd->gamma) {
index 84b203d005a4be7456c54bb7372ded634f4ef15b..4c1c4e28c8d40f4fc3dbcb92058965266efc7cff 100644 (file)
@@ -748,7 +748,7 @@ static void defocus_blur(bNode *node, CompBuf *new, CompBuf *img, CompBuf *zbuf,
                                        p4 = p * new->type;
                                        if (nqd->bktype==0)     // Disk
                                                lwt = ((u*u + v*v)<=cR2) ? wcor : 0.f;
-                                       else    // AA not needed here
+                                       else  /* AA not needed here */
                                                lwt = wcor * getWeight(BKH, len_bkh, u, v, ct_crad, inradsq);
                                        // prevent background bleeding onto in-focus pixels, user-option
                                        if (ct_crad > nqd->bthresh) {  // if center blur > threshold
index a1cc1e23470f63200122f85665d662e3832ba68c..eb628b87b3d59e45d498fce95115ab24920589bb 100644 (file)
@@ -559,7 +559,7 @@ static void GetTextureCoordinate(const SMikkTSpaceContext * pContext, float fUV[
        MTFace *tface= RE_vlakren_get_tface(pMesh->obr, vlr, pMesh->obr->actmtface, NULL, 0);
        const float *coord;
        
-       if (tface != NULL)      {
+       if (tface != NULL) {
                coord= tface->uv[vert_index];
                fUV[0]= coord[0]; fUV[1]= coord[1];
        }
@@ -585,7 +585,7 @@ static void SetTSpace(const SMikkTSpaceContext * pContext, const float fvTangent
        SRenderMeshToTangent * pMesh = (SRenderMeshToTangent *) pContext->m_pUserData;
        VlakRen *vlr= RE_findOrAddVlak(pMesh->obr, face_num);
        float * ftang= RE_vlakren_get_nmap_tangent(pMesh->obr, vlr, 1);
-       if (ftang!=NULL)        {
+       if (ftang!=NULL) {
                copy_v3_v3(&ftang[iVert*4+0], fvTangent);
                ftang[iVert*4+3]=fSign;
        }
index bf18c04cd73048e5b110e485a8f3de693f02832b..f1a5326c602e8c998d84a4deb40504ac537c021f 100644 (file)
@@ -2425,7 +2425,7 @@ void do_material_tex(ShadeInput *shi, Render *re)
                                                }
                                        }
                                }
-#endif                         
+#endif
                        }
 
                        /* mapping */
index a0f5caa826b353f095e4a9cb5c8f782a87b3bdb6..a266914c085ce3af5bf041fb8e24429571592f23 100644 (file)
@@ -1807,7 +1807,7 @@ void shade_lamp_loop(ShadeInput *shi, ShadeResult *shr)
                                shr->diff[1]= sss[1]*col[1];
                                shr->diff[2]= sss[2]*col[2];
 
-                               if (shi->combinedflag & SCE_PASS_SHADOW)        {
+                               if (shi->combinedflag & SCE_PASS_SHADOW) {
                                        shr->shad[0]= shr->diff[0];
                                        shr->shad[1]= shr->diff[1];
                                        shr->shad[2]= shr->diff[2];
index c20a281fa963eb4eac3049842f9566e1f7e497ea..14a25cc13e053d743d56508d2085ca60729bf4ab 100644 (file)
@@ -154,7 +154,7 @@ int wm_gesture_evaluate(wmGesture *gesture)
                        if (val == 6) printf("tweak south-west\n");
                        if (val == 7) printf("tweak west\n");
                        if (val == 8) printf("tweak north-west\n");
-#endif                 
+#endif
                        return val;
                }
        }
index 977cfbaa8d7f54ea7f479a1f0f278d56f22db8a6..1f0756b2c243e6c3c82a2e474c3b344d10481165 100644 (file)
@@ -1208,7 +1208,7 @@ int main(int argc, const char **argv)
                argv[argci] = alloc_utf_8_from_16(argv_16[argci], 0);
        }
        LocalFree(argv_16);
-#endif 
+#endif
 
 #ifdef WITH_PYTHON_MODULE
 #ifdef __APPLE__