Revision: 42853
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42853
Author: campbellbarton
Date: 2011-12-24 02:37:42 +0000 (Sat, 24 Dec 2011)
Log Message:
-----------
formatting edits 120 line length
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/writeavi.c
trunk/blender/source/blender/editors/interface/view2d.c
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
trunk/blender/source/blender/python/generic/bpy_internal_import.c
Modified: trunk/blender/source/blender/blenkernel/intern/writeavi.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeavi.c 2011-12-24
02:32:08 UTC (rev 42852)
+++ trunk/blender/source/blender/blenkernel/intern/writeavi.c 2011-12-24
02:37:42 UTC (rev 42853)
@@ -159,9 +159,6 @@
avi = MEM_mallocN (sizeof(AviMovie), "avimovie");
- /* RPW 11-21-2002
- if (rd->imtype != AVI_FORMAT_MJPEG) format = AVI_FORMAT_AVI_RGB;
- */
if (rd->im_format.imtype != R_IMF_IMTYPE_AVIJPEG ) format =
AVI_FORMAT_AVI_RGB;
else format = AVI_FORMAT_MJPEG;
Modified: trunk/blender/source/blender/editors/interface/view2d.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d.c 2011-12-24
02:32:08 UTC (rev 42852)
+++ trunk/blender/source/blender/editors/interface/view2d.c 2011-12-24
02:37:42 UTC (rev 42853)
@@ -177,7 +177,8 @@
/* see eView2D_CommonViewTypes in UI_view2d.h for available
view presets */
switch (type) {
- /* 'standard view' - optimum setup for 'standard' view
behaviour, that should be used new views as basis for their
+ /* 'standard view' - optimum setup for 'standard' view
behaviour,
+ * that should be used new views as basis for their
* own unique View2D settings, which should be
used instead of this in most cases...
*/
case V2D_COMMONVIEW_STANDARD:
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
2011-12-24 02:32:08 UTC (rev 42852)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
2011-12-24 02:37:42 UTC (rev 42853)
@@ -123,19 +123,19 @@
{
MTex* mtex = &brush->mtex;
- return
- (mtex->tex &&
- mtex->ofs[0] == snap->ofs[0] &&
- mtex->ofs[1] == snap->ofs[1] &&
- mtex->ofs[2] == snap->ofs[2] &&
- mtex->size[0] == snap->size[0] &&
- mtex->size[1] == snap->size[1] &&
- mtex->size[2] == snap->size[2] &&
- mtex->rot == snap->rot) &&
- ((mtex->brush_map_mode == MTEX_MAP_MODE_FIXED &&
brush_size(brush) <= snap->brush_size) || (brush_size(brush) ==
snap->brush_size)) && // make brush smaller shouldn't cause a resample
- mtex->brush_map_mode == snap->brush_map_mode &&
- vc->ar->winx == snap->winx &&
- vc->ar->winy == snap->winy;
+ return ( (mtex->tex) &&
+ equals_v3v3(mtex->ofs, snap->ofs) &&
+ equals_v3v3(mtex->size, snap->size) &&
+ mtex->rot == snap->rot
+ ) &&
+
+ /* make brush smaller shouldn't cause a resample */
+ ( (mtex->brush_map_mode == MTEX_MAP_MODE_FIXED &&
(brush_size(brush) <= snap->brush_size)) ||
+ (brush_size(brush) == snap->brush_size)) &&
+
+ (mtex->brush_map_mode == snap->brush_map_mode) &&
+ (vc->ar->winx == snap->winx) &&
+ (vc->ar->winy == snap->winy);
}
static void make_snap(Snapshot* snap, Brush* brush, ViewContext* vc)
@@ -869,7 +869,10 @@
MEM_freeN(stroke);
return OPERATOR_FINISHED;
}
- else if(first || ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE) ||
(event->type == TIMER && (event->customdata == stroke->timer))) {
+ else if( (first) ||
+ (ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE)) ||
+ (event->type == TIMER && (event->customdata == stroke->timer))
)
+ {
if(stroke->stroke_started) {
if(paint_smooth_stroke(stroke, mouse, event)) {
if(paint_space_stroke_enabled(stroke->brush)) {
@@ -887,7 +890,8 @@
}
}
- /* we want the stroke to have the first daub at the start location
instead of waiting till we have moved the space distance */
+ /* we want the stroke to have the first daub at the start location
+ * instead of waiting till we have moved the space distance */
if(first &&
stroke->stroke_started &&
paint_space_stroke_enabled(stroke->brush) &&
Modified: trunk/blender/source/blender/python/generic/bpy_internal_import.c
===================================================================
--- trunk/blender/source/blender/python/generic/bpy_internal_import.c
2011-12-24 02:32:08 UTC (rev 42852)
+++ trunk/blender/source/blender/python/generic/bpy_internal_import.c
2011-12-24 02:37:42 UTC (rev 42853)
@@ -141,9 +141,10 @@
printf("ERROR: bpy_import_main_set() was not called before
running python. this is a bug.\n");
return NULL;
}
-
- if (namelen >= (MAX_ID_NAME-2) - 3) return NULL; /* we know this cant
be importable, the name is too long for blender! */
-
+
+ /* we know this cant be importable, the name is too long for blender! */
+ if (namelen >= (MAX_ID_NAME-2) - 3) return NULL;
+
memcpy(txtname, name, namelen);
memcpy(&txtname[namelen], ".py", 4);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
