[Bf-blender-cvs] [ecb3e0f] master: Cleanup: whitespace & break placement
Campbell Barton
noreply at git.blender.org
Sat Jul 18 11:08:03 CEST 2015
Commit: ecb3e0fe737c24e62add99f3fa39e305f5d66af2
Author: Campbell Barton
Date: Sat Jul 18 19:02:39 2015 +1000
Branches: master
https://developer.blender.org/rBecb3e0fe737c24e62add99f3fa39e305f5d66af2
Cleanup: whitespace & break placement
===================================================================
M intern/ghost/intern/GHOST_SystemCocoa.mm
M intern/ghost/intern/GHOST_SystemSDL.cpp
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_legacy.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/view2d_ops.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
M source/blender/render/intern/source/convertblender.c
M source/blender/render/intern/source/rendercore.c
===================================================================
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 50d3cc2..b9686e5 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -1045,16 +1045,17 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType
}
eventData = (GHOST_TEventDataPtr) ibuf;
- }
+
break;
-
+ }
default:
return GHOST_kFailure;
break;
}
pushEvent(new GHOST_EventDragnDrop(getMilliSeconds(),eventType,draggedObjectType,window,mouseX,mouseY,eventData));
- }
+
break;
+ }
default:
return GHOST_kFailure;
}
diff --git a/intern/ghost/intern/GHOST_SystemSDL.cpp b/intern/ghost/intern/GHOST_SystemSDL.cpp
index 8561dbf..e9768e4 100644
--- a/intern/ghost/intern/GHOST_SystemSDL.cpp
+++ b/intern/ghost/intern/GHOST_SystemSDL.cpp
@@ -320,8 +320,9 @@ GHOST_SystemSDL::processEvent(SDL_Event *sdl_event)
g_event = new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowClose, window);
break;
}
- }
+
break;
+ }
case SDL_QUIT:
g_event = new GHOST_Event(getMilliSeconds(), GHOST_kEventQuit, NULL);
break;
@@ -417,8 +418,8 @@ GHOST_SystemSDL::processEvent(SDL_Event *sdl_event)
GHOST_WindowSDL *window = findGhostWindow(SDL_GetWindowFromID_fallback(sdl_sub_evt.windowID));
assert(window != NULL);
g_event = new GHOST_EventWheel(getMilliSeconds(), window, sdl_sub_evt.y);
- }
break;
+ }
case SDL_KEYDOWN:
case SDL_KEYUP:
{
@@ -488,8 +489,8 @@ GHOST_SystemSDL::processEvent(SDL_Event *sdl_event)
}
g_event = new GHOST_EventKey(getMilliSeconds(), type, window, gkey, sym, NULL);
- }
break;
+ }
}
if (g_event) {
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index ca621e1..db07344 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2861,12 +2861,12 @@ static ImBuf *seq_render_movie_strip(const SeqRenderData *context, Sequence *seq
seq->strip->proxy ? seq->strip->proxy->tc : IMB_TC_RECORD_RUN,
proxy_size);
- /* fetching for requested proxy size failed, try fetching the original instead */
- if (!ibuf_arr[i] && proxy_size != IMB_PROXY_NONE) {
- ibuf_arr[i] = IMB_anim_absolute(sanim->anim, nr + seq->anim_startofs,
- seq->strip->proxy ? seq->strip->proxy->tc : IMB_TC_RECORD_RUN,
- IMB_PROXY_NONE);
- }
+ /* fetching for requested proxy size failed, try fetching the original instead */
+ if (!ibuf_arr[i] && proxy_size != IMB_PROXY_NONE) {
+ ibuf_arr[i] = IMB_anim_absolute(sanim->anim, nr + seq->anim_startofs,
+ seq->strip->proxy ? seq->strip->proxy->tc : IMB_TC_RECORD_RUN,
+ IMB_PROXY_NONE);
+ }
if (ibuf_arr[i]) {
/* we don't need both (speed reasons)! */
if (ibuf_arr[i]->rect_float && ibuf_arr[i]->rect)
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 2eba2b2..cc45af6 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2107,8 +2107,9 @@ static void lib_link_fmodifiers(FileData *fd, ID *id, ListBase *list)
{
FMod_Python *data = (FMod_Python *)fcm->data;
data->script = newlibadr(fd, id->lib, data->script);
- }
+
break;
+ }
}
}
}
@@ -2166,23 +2167,26 @@ static void direct_link_fmodifiers(FileData *fd, ListBase *list)
if (fd->flags & FD_FLAGS_SWITCH_ENDIAN) {
BLI_endian_switch_float_array(data->coefficients, data->arraysize);
}
- }
+
break;
+ }
case FMODIFIER_TYPE_ENVELOPE:
{
FMod_Envelope *data= (FMod_Envelope *)fcm->data;
data->data= newdataadr(fd, data->data);
- }
+
break;
+ }
case FMODIFIER_TYPE_PYTHON:
{
FMod_Python *data = (FMod_Python *)fcm->data;
data->prop = newdataadr(fd, data->prop);
IDP_DirectLinkGroup_OrFree(&data->prop, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
- }
+
break;
+ }
}
}
}
@@ -4554,7 +4558,7 @@ static void lib_link_object(FileData *fd, Main *main)
bCameraActuator *ca = act->data;
ca->ob= newlibadr(fd, ob->id.lib, ca->ob);
}
- /* leave this one, it's obsolete but necessary to read for conversion */
+ /* leave this one, it's obsolete but necessary to read for conversion */
else if (act->type == ACT_ADD_OBJECT) {
bAddObjectActuator *eoa = act->data;
if (eoa) eoa->ob= newlibadr(fd, ob->id.lib, eoa->ob);
@@ -8375,8 +8379,9 @@ static void expand_fmodifiers(FileData *fd, Main *mainvar, ListBase *list)
FMod_Python *data = (FMod_Python *)fcm->data;
expand_doit(fd, mainvar, data->script);
- }
+
break;
+ }
}
}
}
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index 2727f3a..43ebab7 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -807,7 +807,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main)
}
#undef SEQ_USE_PROXY_CUSTOM_DIR
#undef SEQ_USE_PROXY_CUSTOM_FILE
- }
+ }
SEQ_END
}
}
@@ -1589,7 +1589,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main)
bAnimVizSettings *avs = &ob->pose->avs;
/* ghosting settings ---------------- */
- /* ranges */
+ /* ranges */
avs->ghost_bc = avs->ghost_ac = arm->ghostep;
avs->ghost_sf = arm->ghostsf;
@@ -1599,19 +1599,19 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main)
avs->ghost_ef = 100;
}
- /* type */
+ /* type */
if (arm->ghostep == 0)
avs->ghost_type = GHOST_TYPE_NONE;
else
avs->ghost_type = arm->ghosttype + 1;
- /* stepsize */
+ /* stepsize */
avs->ghost_step = arm->ghostsize;
if (avs->ghost_step == 0)
avs->ghost_step = 1;
/* path settings --------------------- */
- /* ranges */
+ /* ranges */
avs->path_bc = arm->pathbc;
avs->path_ac = arm->pathac;
if ((avs->path_bc == avs->path_ac) && (avs->path_bc == 0))
@@ -1624,7 +1624,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main)
avs->path_ef = 250;
}
- /* flags */
+ /* flags */
if (arm->pathflag & ARM_PATH_FNUMS)
avs->path_viewflag |= MOTIONPATH_VIEW_FNUMS;
if (arm->pathflag & ARM_PATH_KFRAS)
@@ -1632,15 +1632,15 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main)
if (arm->pathflag & ARM_PATH_KFNOS)
avs->path_viewflag |= MOTIONPATH_VIEW_KFNOS;
- /* bake flags */
+ /* bake flags */
if (arm->pathflag & ARM_PATH_HEADS)
avs->path_bakeflag |= MOTIONPATH_BAKE_HEADS;
- /* type */
+ /* type */
if (arm->pathflag & ARM_PATH_ACFRA)
avs->path_type = MOTIONPATH_TYPE_ACFRA;
- /* stepsize */
+ /* stepsize */
avs->path_step = arm->pathsize;
if (avs->path_step == 0)
avs->path_step = 1;
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c
index 1819dcd..dcfafc2 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -2401,8 +2401,9 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
data->flag |= MINMAX_STICKY;
else
data->flag &= ~MINMAX_STICKY;
- }
+
break;
+ }
case CONSTRAINT_TYPE_ROTLIKE:
{
bRotateLikeConstraint *data = curcon->data;
@@ -2410,8 +2411,9 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
/* version patch from buttons_object.c */
if (data->flag == 0)
data->flag = ROTLIKE_X|ROTLIKE_Y|ROTLIKE_Z;
- }
+
break;
+ }
}
}
}
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 25d3f4f..e03db11 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -613,8 +613,9 @@ static void write_fmodifiers(WriteData *wd, ListBase *fmodifiers)
/* write coefficients array */
if (data->coefficients)
writedata(wd, DATA, sizeof(float)*(data->arraysize), data->coefficients);
- }
+
break;
+ }
case FMODIFIER_TYPE_ENVELOPE:
{
FMod_Envelope *data= (FMod_Envelope *)fcm->data;
@@ -622,8 +623,9 @@ static void write_fmodifiers(WriteData *wd, ListBase *fmodifiers)
/* write envelope data */
if (data->data)
writestruct(wd, DATA, "FCM_EnvelopeData", data->totvert, data->data);
- }
+
break;
+ }
case FMODIFIER_TYPE_PYTHON:
{
FMod_Python *data = (FMod_Python *)fcm->data;
@@ -631,8 +633,9 @@ static void write_fmodifiers(WriteData *wd, ListBase *fmodifiers)
/* Write ID Properties -- and copy this comment EXACTLY for easy finding
* of library blocks that implement this.*/
IDP_WriteProperty(data->prop, wd);
- }
+
break;
+ }
}
}
}
@@ -1425,16 +1428,18 @@ static void write_constraints(WriteData *wd, ListBase *conlist)
/* Write ID Properties -- and copy this comment EXACTLY for easy finding
* of library blocks that implement this.*/
IDP_WriteProperty(data->prop, wd);
- }
+
break;
+ }
case CONSTRAINT_TYPE_SPLINEIK:
{
bSplineIKConstraint *data = (bSplineIKConstraint *)con->data;
/* write points array */
writedata(wd, DATA, sizeof(float)*(data->numpoints), data->points);
- }
+
break;
+ }
}
}
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index ebd05d8..7bed7a4 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list