Revision: 51268
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51268
Author: campbellbarton
Date: 2012-10-10 23:44:07 +0000 (Wed, 10 Oct 2012)
Log Message:
-----------
style cleanup:
also add helper makefile targets:
* tbz - makes a tar.bz2 of an svn export
* test_style_qtc - outputs style checks in qtc task format.
Modified Paths:
--------------
trunk/blender/GNUmakefile
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/ipo.c
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/editors/armature/meshlaplacian.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/object/object_iterators.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_view3d/drawvolume.c
trunk/blender/source/tools/check_style_c.py
Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile 2012-10-10 15:56:43 UTC (rev 51267)
+++ trunk/blender/GNUmakefile 2012-10-10 23:44:07 UTC (rev 51268)
@@ -168,6 +168,7 @@
@echo " * test_pep8 - checks all python script are pep8 which
are tagged to use the stricter formatting"
@echo " * test_deprecated - checks for deprecation tags in our code
which may need to be removed"
@echo " * test_style - checks C/C++ conforms with blenders style
guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle";
+ @echo " * test_style_qtc - same as test_style but outputs QtCreator
tasks format"
@echo ""
@echo "Static Source Code Checking (not associated with building
blender)"
@echo " * check_cppcheck - run blender source through cppcheck (C &
C++)"
@@ -178,6 +179,9 @@
@echo " * check_spelling_c - check for spelling errors (C/C++ only)"
@echo " * check_spelling_py - check for spelling errors (Python only)"
@echo ""
+ @echo "Utilities (not associated with building blender)"
+ @echo " * tbz - create a compressed svn export
'blender_archive.tar.bz2'"
+ @echo ""
@echo "Documentation Targets (not associated with building blender)"
@echo " * doc_py - generate sphinx python api docs"
@echo " * doc_doxy - generate doxygen C/C++ docs"
@@ -223,6 +227,14 @@
# run our own checks on C/C++ style
PYTHONIOENCODING=utf_8 python3.2
$(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender
$(BLENDER_DIR)/source/creator --no-length-check
+test_style_qtc:
+ # run our own checks on C/C++ style
+ USE_QTC_TASK=1 \
+ PYTHONIOENCODING=utf_8 python3.2
$(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender
$(BLENDER_DIR)/source/creator --no-length-check > \
+ test_style.tasks
+
+ @echo "written: test_style.tasks"
+
# -----------------------------------------------------------------------------
# Project Files
#
@@ -267,7 +279,19 @@
check_spelling_c:
cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3.2
$(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/source
+
# -----------------------------------------------------------------------------
+# Utilities
+#
+
+tbz:
+ svn export . blender_archive
+ tar cjf blender_archive.tar.bz2 blender_archive/
+ rm -rf blender_archive/
+ @echo "blender_archive.tar.bz2 written"
+
+
+# -----------------------------------------------------------------------------
# Documentation
#
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2012-10-10
15:56:43 UTC (rev 51267)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2012-10-10
23:44:07 UTC (rev 51268)
@@ -1678,8 +1678,8 @@
ListBase *duplilist = MEM_mallocN(sizeof(ListBase), "duplilist");
int flag = 0;
- if(update) flag |= DUPLILIST_DO_UPDATE;
- if(for_render) flag |= DUPLILIST_FOR_RENDER;
+ if (update) flag |= DUPLILIST_DO_UPDATE;
+ if (for_render) flag |= DUPLILIST_FOR_RENDER;
duplilist->first = duplilist->last = NULL;
object_duplilist_recursive((ID *)sce, sce, ob, duplilist, NULL, 0, 0,
flag);
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-10-10
15:56:43 UTC (rev 51267)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-10-10
23:44:07 UTC (rev 51268)
@@ -2358,7 +2358,9 @@
const LayerTypeInfo *typeInfo;
int i;
- if (!*block) return;
+ if (*block == NULL)
+ return;
+
for (i = 0; i < data->totlayer; ++i) {
if (!(data->layers[i].flag & CD_FLAG_NOFREE)) {
typeInfo = layerType_getInfo(data->layers[i].type);
@@ -2394,7 +2396,7 @@
const LayerTypeInfo *typeInfo;
int dest_i, src_i;
- if (!*dest_block) {
+ if (*dest_block == NULL) {
CustomData_bmesh_alloc_block(dest, dest_block);
if (*dest_block)
memset(*dest_block, 0, dest->totsize);
@@ -2614,7 +2616,7 @@
const LayerTypeInfo *typeInfo;
int i;
- if (!*block)
+ if (*block == NULL)
CustomData_bmesh_alloc_block(data, block);
for (i = 0; i < data->totlayer; ++i) {
@@ -2634,7 +2636,7 @@
const LayerTypeInfo *typeInfo;
int dest_i, src_i, src_offset;
- if (!*dest_block)
+ if (*dest_block == NULL)
CustomData_bmesh_alloc_block(dest, dest_block);
/* copies a layer at a time */
Modified: trunk/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ipo.c 2012-10-10
15:56:43 UTC (rev 51267)
+++ trunk/blender/source/blender/blenkernel/intern/ipo.c 2012-10-10
23:44:07 UTC (rev 51268)
@@ -2093,7 +2093,7 @@
bAction *new_act;
/* add a new action for this, and convert all data into
that action */
- new_act = add_empty_action(id->name+2);
+ new_act = add_empty_action(id->name + 2);
ipo_to_animato(NULL, ipo, NULL, NULL, NULL, NULL,
&new_act->curves, &drivers);
new_act->idroot = ipo->blocktype;
}
Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c 2012-10-10
15:56:43 UTC (rev 51267)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2012-10-10
23:44:07 UTC (rev 51268)
@@ -95,38 +95,38 @@
static LARGE_INTEGER liStartTime;
static LARGE_INTEGER liCurrentTime;
-static void tstart ( void )
+static void tstart(void)
{
- QueryPerformanceFrequency ( &liFrequency );
- QueryPerformanceCounter ( &liStartTime );
+ QueryPerformanceFrequency(&liFrequency);
+ QueryPerformanceCounter(&liStartTime);
}
-static void tend ( void )
+static void tend(void)
{
- QueryPerformanceCounter ( &liCurrentTime );
+ QueryPerformanceCounter(&liCurrentTime);
}
-static double tval( void )
+static double tval(void)
{
- return ((double)( (liCurrentTime.QuadPart - liStartTime.QuadPart)*
(double)1000.0/(double)liFrequency.QuadPart ));
+ return ((double)( (liCurrentTime.QuadPart - liStartTime.QuadPart) *
(double)1000.0 / (double)liFrequency.QuadPart));
}
#else
#include <sys/time.h>
static struct timeval _tstart, _tend;
static struct timezone tz;
-static void tstart ( void )
+static void tstart(void)
{
- gettimeofday ( &_tstart, &tz );
+ gettimeofday(&_tstart, &tz);
}
-static void tend ( void )
+static void tend(void)
{
- gettimeofday ( &_tend,&tz );
+ gettimeofday(&_tend, &tz);
}
-static double UNUSED_FUNCTION(tval)( void )
+static double UNUSED_FUNCTION(tval) (void)
{
double t1, t2;
- t1 = ( double ) _tstart.tv_sec*1000 + ( double ) _tstart.tv_usec/ (
1000 );
- t2 = ( double ) _tend.tv_sec*1000 + ( double ) _tend.tv_usec/ ( 1000 );
- return t2-t1;
+ t1 = ( double ) _tstart.tv_sec * 1000 + ( double ) _tstart.tv_usec /
(1000);
+ t2 = ( double ) _tend.tv_sec * 1000 + ( double ) _tend.tv_usec / (1000);
+ return t2 - t1;
}
#endif
@@ -138,9 +138,9 @@
// timestep default value for nice appearance 0.1f
#define DT_DEFAULT 0.1f
-#define ADD_IF_LOWER_POS(a,b) (MIN2((a)+(b), MAX2((a),(b))))
-#define ADD_IF_LOWER_NEG(a,b) (MAX2((a)+(b), MIN2((a),(b))))
-#define ADD_IF_LOWER(a,b)
(((b)>0)?ADD_IF_LOWER_POS((a),(b)):ADD_IF_LOWER_NEG((a),(b)))
+#define ADD_IF_LOWER_POS(a, b) (MIN2((a) + (b), MAX2((a), (b))))
+#define ADD_IF_LOWER_NEG(a, b) (MAX2((a) + (b), MIN2((a), (b))))
+#define ADD_IF_LOWER(a, b) (((b) > 0) ? ADD_IF_LOWER_POS((a), (b)) :
ADD_IF_LOWER_NEG((a), (b)))
#else /* WITH_SMOKE */
@@ -152,8 +152,8 @@
void smoke_turbulence_free(struct WTURBULENCE *UNUSED(wt)) {}
void smoke_initWaveletBlenderRNA(struct WTURBULENCE *UNUSED(wt), float
*UNUSED(strength)) {}
void smoke_initBlenderRNA(struct FLUID_3D *UNUSED(fluid), float
*UNUSED(alpha), float *UNUSED(beta), float *UNUSED(dt_factor), float
*UNUSED(vorticity),
- int *UNUSED(border_colli),
float *UNUSED(burning_rate), float *UNUSED(flame_smoke), float
*UNUSED(flame_smoke_color),
- float
*UNUSED(flame_vorticity), float *UNUSED(flame_ignition_temp), float
*UNUSED(flame_max_temp)) {}
+ int *UNUSED(border_colli), float
*UNUSED(burning_rate), float *UNUSED(flame_smoke), float
*UNUSED(flame_smoke_color),
+ float *UNUSED(flame_vorticity), float
*UNUSED(flame_ignition_temp), float *UNUSED(flame_max_temp)) {}
struct DerivedMesh *smokeModifier_do(SmokeModifierData *UNUSED(smd), Scene
*UNUSED(scene), Object *UNUSED(ob), DerivedMesh *UNUSED(dm)) { return NULL; }
float smoke_get_velocity_at(struct Object *UNUSED(ob), float
UNUSED(position[3]), float UNUSED(velocity[3])) { return 0.0f; }
void flame_get_spectrum(unsigned char *UNUSED(spec), int UNUSED(width), float
UNUSED(t1), float UNUSED(t2)) {}
@@ -165,18 +165,18 @@
void smoke_reallocate_fluid(SmokeDomainSettings *sds, float dx, int res[3],
int free_old)
{
int use_heat = (sds->active_fields & SM_ACTIVE_HEAT);
- int use_fire = (sds->active_fields & (SM_ACTIVE_HEAT|SM_ACTIVE_FIRE));
+ int use_fire = (sds->active_fields & (SM_ACTIVE_HEAT | SM_ACTIVE_FIRE));
int use_colors = (sds->active_fields & SM_ACTIVE_COLORS);
if (free_old && sds->fluid)
smoke_free(sds->fluid);
- if (!MIN3(res[0],res[1],res[2])) {
+ if (!MIN3(res[0], res[1], res[2])) {
sds->fluid = NULL;
return;
}
sds->fluid = smoke_init(res, dx, DT_DEFAULT, use_heat, use_fire,
use_colors);
smoke_initBlenderRNA(sds->fluid, &(sds->alpha), &(sds->beta),
&(sds->time_scale), &(sds->vorticity), &(sds->border_collisions),
- &(sds->burning_rate),
&(sds->flame_smoke), sds->flame_smoke_color, &(sds->flame_vorticity),
&(sds->flame_ignition), &(sds->flame_max_temp));
+ &(sds->burning_rate), &(sds->flame_smoke),
sds->flame_smoke_color, &(sds->flame_vorticity), &(sds->flame_ignition),
&(sds->flame_max_temp));
/* reallocate shadow buffer */
if (sds->shadow)
@@ -186,19 +186,19 @@
void smoke_reallocate_highres_fluid(SmokeDomainSettings *sds, float dx, int
res[3], int free_old)
{
- int use_fire = (sds->active_fields & (SM_ACTIVE_HEAT|SM_ACTIVE_FIRE));
+ int use_fire = (sds->active_fields & (SM_ACTIVE_HEAT | SM_ACTIVE_FIRE));
int use_colors = (sds->active_fields & SM_ACTIVE_COLORS);
if (free_old && sds->wt)
smoke_turbulence_free(sds->wt);
- if (!MIN3(res[0],res[1],res[2])) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
