Revision: 53190
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53190
Author: campbellbarton
Date: 2012-12-20 00:29:31 +0000 (Thu, 20 Dec 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/release/scripts/templates/addon_add_object.py
trunk/blender/source/blender/blenkernel/intern/gpencil.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/editors/interface/interface_panel.c
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
Modified: trunk/blender/release/scripts/templates/addon_add_object.py
===================================================================
--- trunk/blender/release/scripts/templates/addon_add_object.py 2012-12-19
21:17:16 UTC (rev 53189)
+++ trunk/blender/release/scripts/templates/addon_add_object.py 2012-12-20
00:29:31 UTC (rev 53190)
@@ -2,7 +2,7 @@
"name": "New Object",
"author": "Your Name Here",
"version": (1, 0),
- "blender": (2, 5, 5),
+ "blender": (2, 65, 0),
"location": "View3D > Add > Mesh > New Object",
"description": "Adds a new Mesh Object",
"warning": "",
Modified: trunk/blender/source/blender/blenkernel/intern/gpencil.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/gpencil.c 2012-12-19
21:17:16 UTC (rev 53189)
+++ trunk/blender/source/blender/blenkernel/intern/gpencil.c 2012-12-20
00:29:31 UTC (rev 53190)
@@ -188,7 +188,7 @@
/* make this one the active one */
if (setactive)
- gpencil_layer_setactive(gpd, gpl);
+ gpencil_layer_setactive(gpd, gpl);
/* return layer */
return gpl;
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-12-19
21:17:16 UTC (rev 53189)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-12-20
00:29:31 UTC (rev 53190)
@@ -1957,7 +1957,7 @@
}
closest_to_line_segment_v3(ve, opco, nv2, nv3);
- sub_v3_v3v3(ve, opco,
ve);
+ sub_v3_v3v3(ve, opco,
ve);
dist = normalize_v3(ve);
if ((dist <
outerfacethickness)&&(dist < mindistedge )) {
copy_v3_v3(coledge, ve);
@@ -1966,7 +1966,7 @@
}
closest_to_line_segment_v3(ve, opco, nv3, nv1);
- sub_v3_v3v3(ve, opco,
ve);
+ sub_v3_v3v3(ve, opco,
ve);
dist = normalize_v3(ve);
if ((dist <
outerfacethickness)&&(dist < mindistedge )) {
copy_v3_v3(coledge, ve);
Modified: trunk/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_panel.c
2012-12-19 21:17:16 UTC (rev 53189)
+++ trunk/blender/source/blender/editors/interface/interface_panel.c
2012-12-20 00:29:31 UTC (rev 53190)
@@ -1066,7 +1066,7 @@
ED_region_tag_redraw(ar);
}
else { /* collapse */
- if(ctrl)
+ if (ctrl)
panels_collapse_all(sa, ar, block->panel);
if (block->panel->flag & PNL_CLOSED) {
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
2012-12-19 21:17:16 UTC (rev 53189)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
2012-12-20 00:29:31 UTC (rev 53190)
@@ -1041,8 +1041,8 @@
const int flag = U.ndof_flag;
#if 0
- int shouldRotate = (flag & NDOF_SHOULD_ROTATE) && (fly->pan_view ==
FALSE),
- shouldTranslate = (flag & (NDOF_SHOULD_PAN | NDOF_SHOULD_ZOOM));
+ int shouldRotate = (flag & NDOF_SHOULD_ROTATE) && (fly->pan_view ==
FALSE);
+ int shouldTranslate = (flag & (NDOF_SHOULD_PAN | NDOF_SHOULD_ZOOM));
#endif
int shouldRotate = (fly->pan_view == FALSE);
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2012-12-19
21:17:16 UTC (rev 53189)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2012-12-20
00:29:31 UTC (rev 53190)
@@ -2444,7 +2444,7 @@
{0, NULL, 0, NULL, NULL}
};
- static EnumPropertyItem storage_items[] ={
+ static EnumPropertyItem storage_items[] = {
{RAS_STORE_AUTO, "AUTO", 0, "Auto Select", "Chooses the best
supported mode"},
{RAS_STORE_IMMEDIATE, "IMMEDIATE", 0, "Immediate Mode",
"Slowest performance, requires OpenGL (any version)"},
{RAS_STORE_VA, "VERTEX_ARRAY", 0, "Vertex Arrays", "Better
performance, requires at least OpenGL 1.1"},
@@ -2487,7 +2487,7 @@
RNA_def_property_ui_text(prop, "Exit Key", "The key that exits the
Game Engine");
RNA_def_property_update(prop, NC_SCENE, NULL);
- prop= RNA_def_property(srna, "raster_storage", PROP_ENUM, PROP_NONE);
+ prop = RNA_def_property(srna, "raster_storage", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "raster_storage");
RNA_def_property_enum_items(prop, storage_items);
RNA_def_property_ui_text(prop, "Storage", "Sets the storage mode used
by the rasterizer");
Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c
2012-12-19 21:17:16 UTC (rev 53189)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c
2012-12-20 00:29:31 UTC (rev 53190)
@@ -2864,7 +2864,7 @@
}
else {
if (need_orco) {
- orco= get_object_orco(re, ob);
+ orco = get_object_orco(re, ob);
}
while (dl) {
Modified: trunk/blender/source/blender/windowmanager/WM_api.h
===================================================================
--- trunk/blender/source/blender/windowmanager/WM_api.h 2012-12-19 21:17:16 UTC
(rev 53189)
+++ trunk/blender/source/blender/windowmanager/WM_api.h 2012-12-20 00:29:31 UTC
(rev 53190)
@@ -144,9 +144,11 @@
void WM_event_remove_keymap_handler(ListBase *handlers, wmKeyMap
*keymap);
-struct wmEventHandler *WM_event_add_ui_handler(const struct bContext *C,
ListBase *handlers,
- int (*func)(struct bContext *C, struct wmEvent *event,
void *userdata),
- void (*remove)(struct bContext *C, void *userdata),
void *userdata);
+struct wmEventHandler *WM_event_add_ui_handler(
+ const struct bContext *C, ListBase *handlers,
+ int (*func)(struct bContext *C, struct wmEvent *event, void
*userdata),
+ void (*remove)(struct bContext *C, void *userdata), void
*userdata);
+
void WM_event_remove_ui_handler(ListBase *handlers,
int (*func)(struct bContext *C, struct
wmEvent *event, void *userdata),
void (*remove)(struct bContext *C, void
*userdata),
Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
2012-12-19 21:17:16 UTC (rev 53189)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
2012-12-20 00:29:31 UTC (rev 53190)
@@ -1004,7 +1004,7 @@
// Enter main loop
bool run = true;
- char *python_main = NULL;
+ char *python_main = NULL;
pynextframestate.state = NULL;
pynextframestate.func = NULL;
#ifdef WITH_PYTHON
@@ -1015,24 +1015,24 @@
char *python_code =
KX_GetPythonCode(maggie, python_main);
if (python_code)
{
-#ifdef WITH_PYTHON
+#ifdef WITH_PYTHON
gpg_nextframestate.system = system;
gpg_nextframestate.app = &app;
gpg_nextframestate.gs = &gs;
pynextframestate.state = &gpg_nextframestate;
pynextframestate.func = &GPG_PyNextFrame;
- printf("Yielding control to Python script
'%s'...\n", python_main);
- PyRun_SimpleString(python_code);
- printf("Exit Python script '%s'\n",
python_main);
+
printf("Yielding control to Python script '%s'...\n", python_main);
+
PyRun_SimpleString(python_code);
+ printf("Exit
Python script '%s'\n", python_main);
#endif // WITH_PYTHON
- MEM_freeN(python_code);
- }
- else {
- fprintf(stderr, "ERROR: cannot yield control
to Python: no Python text data block named '%s'\n", python_main);
- }
- }
- else
+
MEM_freeN(python_code);
+ }
+ else {
+ fprintf(stderr,
"ERROR: cannot yield control to Python: no Python text data block named
'%s'\n", python_main);
+ }
+ }
+ else
{
while (run)
{
Modified:
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
===================================================================
---
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
2012-12-19 21:17:16 UTC (rev 53189)
+++
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
2012-12-20 00:29:31 UTC (rev 53190)
@@ -202,7 +202,7 @@
glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
- }
+}
RAS_StorageVBO::RAS_StorageVBO(int *texco_num, RAS_IRasterizer::TexCoGen
*texco, int *attrib_num, RAS_IRasterizer::TexCoGen *attrib):
m_texco_num(texco_num),
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
