Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

style cleanup: also quiet harmless compiler warning.

Browse Source
This commit is contained in:
Campbell Barton
2012-10-29 15:43:54 +00:00
parent 76288fad8c
commit eb69d1c1ae
12 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -186,11 +186,11 @@ unset(PLATFORM_DEFAULT)
# Modifiers # Modifiers
option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON) option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON)
option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON) option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON)
option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON) option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
option(WITH_MOD_REMESH "Enable Remesh Modifier" ON) option(WITH_MOD_REMESH "Enable Remesh Modifier" ON)
option(WITH_MOD_CLOTH_ELTOPO "Enable Experimental cloth solver" OFF) option(WITH_MOD_CLOTH_ELTOPO "Enable Experimental cloth solver" OFF)
mark_as_advanced(WITH_MOD_CLOTH_ELTOPO) mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF) option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)

2
intern/ghost/intern/GHOST_SystemCocoa.mm
View File

@@ -1159,7 +1159,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType
NSEnumerator *enumerator; NSEnumerator *enumerator;
NSImageRep *representation; NSImageRep *representation;
ibuf = IMB_allocImBuf (imgSize.width , imgSize.height, 32, IB_rect); ibuf = IMB_allocImBuf (imgSize.width, imgSize.height, 32, IB_rect);
if (!ibuf) { if (!ibuf) {
[droppedImg release]; [droppedImg release];
return GHOST_kFailure; return GHOST_kFailure;

2
source/blender/blenkernel/intern/mask_rasterize.c
View File

@@ -104,7 +104,7 @@
/* for debugging add... */ /* for debugging add... */
#ifndef NDEBUG #ifndef NDEBUG
/* printf("%u %u %u %u\n", _t[0], _t[1], _t[2], _t[3]); \ */ /* printf("%u %u %u %u\n", _t[0], _t[1], _t[2], _t[3]); \ */
# define FACE_ASSERT(face, vert_max) \ # define FACE_ASSERT(face, vert_max) \
{ \ { \
unsigned int *_t = face; \ unsigned int *_t = face; \

2
source/blender/bmesh/intern/bmesh_operators.c
View File

@@ -1026,7 +1026,7 @@ static void bmo_flag_layer_alloc(BMesh *bm)
int i; int i;
BMIter iter; BMIter iter;
BLI_mempool *oldpool = bm->toolflagpool; /* old flag pool */ BLI_mempool *oldpool = bm->toolflagpool; /* old flag pool */
BLI_mempool *newpool; BLI_mempool *newpool;
void *oldflags; void *oldflags;

2
source/blender/bmesh/intern/bmesh_walkers_impl.c
View File

@@ -598,7 +598,7 @@ static void *bmw_LoopWalker_step(BMWalker *walker)
} }
} }
} }
else { /* WIRE EDGE */ else { /* WIRE EDGE */
BMIter eiter; BMIter eiter;
/* match trunk: mark all connected wire edges */ /* match trunk: mark all connected wire edges */

12
source/blender/bmesh/operators/bmo_smooth_laplacian.c
View File

@@ -107,12 +107,12 @@ static void delete_laplacian_system(LaplacianSystem * sys)
static void memset_laplacian_system(LaplacianSystem *sys, int val) static void memset_laplacian_system(LaplacianSystem *sys, int val)
{ {
memset(sys->eweights , val, sizeof(float) * sys->numEdges); memset(sys->eweights, val, sizeof(float) * sys->numEdges);
memset(sys->fweights , val, sizeof(float) * sys->numFaces * 3); memset(sys->fweights, val, sizeof(float) * sys->numFaces * 3);
memset(sys->ring_areas , val, sizeof(float) * sys->numVerts); memset(sys->ring_areas, val, sizeof(float) * sys->numVerts);
memset(sys->vlengths , val, sizeof(float) * sys->numVerts); memset(sys->vlengths, val, sizeof(float) * sys->numVerts);
memset(sys->vweights , val, sizeof(float) * sys->numVerts); memset(sys->vweights, val, sizeof(float) * sys->numVerts);
memset(sys->zerola , val, sizeof(short) * sys->numVerts); memset(sys->zerola, val, sizeof(short) * sys->numVerts);
} }
static LaplacianSystem * init_laplacian_system( int a_numEdges, int a_numFaces, int a_numVerts) static LaplacianSystem * init_laplacian_system( int a_numEdges, int a_numFaces, int a_numVerts)

8
source/blender/editors/space_logic/space_logic.c
View File

@@ -93,10 +93,10 @@ static SpaceLink *logic_new(const bContext *UNUSED(C))
slogic->spacetype= SPACE_LOGIC; slogic->spacetype= SPACE_LOGIC;
/* default options */ /* default options */
slogic->scaflag = (BUTS_SENS_SEL|BUTS_SENS_ACT|BUTS_SENS_LINK) | slogic->scaflag = ((BUTS_SENS_SEL|BUTS_SENS_ACT|BUTS_SENS_LINK) |
(BUTS_CONT_SEL|BUTS_CONT_ACT|BUTS_CONT_LINK) | (BUTS_CONT_SEL|BUTS_CONT_ACT|BUTS_CONT_LINK) |
(BUTS_ACT_SEL|BUTS_ACT_ACT|BUTS_ACT_LINK) | (BUTS_ACT_SEL|BUTS_ACT_ACT|BUTS_ACT_LINK) |
(BUTS_SENS_STATE|BUTS_ACT_STATE); (BUTS_SENS_STATE|BUTS_ACT_STATE));
/* header */ /* header */

2
source/blender/editors/transform/transform_generics.c
View File

@@ -1712,7 +1712,7 @@ void calculatePropRatio(TransInfo *t)
/* /*
* The elements are sorted according to their dist member in the array, * The elements are sorted according to their dist member in the array,
* that means we can stop when it finds one element outside of the propsize. * that means we can stop when it finds one element outside of the propsize.
* do not set td->flag |= TD_NOACTION , the prop circle is being changed. * do not set 'td->flag |= TD_NOACTION', the prop circle is being changed.
*/ */
td->factor = 0.0f; td->factor = 0.0f;

2
source/blender/makesrna/intern/rna_gpencil.c
View File

@@ -558,7 +558,7 @@ static void rna_def_gpencil_layers_api(BlenderRNA *brna, PropertyRNA *cprop)
func = RNA_def_function(srna, "new", "rna_GPencil_layer_new"); func = RNA_def_function(srna, "new", "rna_GPencil_layer_new");
RNA_def_function_ui_description(func, "Add a new grease pencil layer"); RNA_def_function_ui_description(func, "Add a new grease pencil layer");
parm = RNA_def_string(func, "name", "GPencilLayer", MAX_NAME, "Name", "Name of the layer"); parm = RNA_def_string(func, "name", "GPencilLayer", MAX_NAME, "Name", "Name of the layer");
RNA_def_property_flag(parm, PROP_REQUIRED); RNA_def_property_flag(parm, PROP_REQUIRED);
RNA_def_boolean(func, "set_active", 0, "Set Active", "Set the newly created layer to the active layer"); RNA_def_boolean(func, "set_active", 0, "Set Active", "Set the newly created layer to the active layer");
parm = RNA_def_pointer(func, "layer", "GPencilLayer", "", "The newly created layer"); parm = RNA_def_pointer(func, "layer", "GPencilLayer", "", "The newly created layer");

10
source/blender/modifiers/intern/MOD_array.c
View File

@@ -314,7 +314,8 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
BMesh *bm = DM_to_bmesh(dm); BMesh *bm = DM_to_bmesh(dm);
BMOperator first_dupe_op, dupe_op, old_dupe_op, weld_op; BMOperator first_dupe_op, dupe_op, old_dupe_op, weld_op;
BMVert **first_geom = NULL; BMVert **first_geom = NULL;
int i, j, indexLen; int i, j;
int index_len = -1; /* initialize to an invalid value */
/* offset matrix */ /* offset matrix */
float offset[4][4]; float offset[4][4];
float final_offset[4][4]; float final_offset[4][4];
@@ -452,12 +453,15 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
/*calculate merge mapping*/ /*calculate merge mapping*/
if (j == 0) { if (j == 0) {
indexMap = find_doubles_index_map(bm, &dupe_op, indexMap = find_doubles_index_map(bm, &dupe_op,
amd, &indexLen); amd, &index_len);
} }
#define _E(s, i) ((BMVert **)(s)->data.buf)[i] #define _E(s, i) ((BMVert **)(s)->data.buf)[i]
for (i = 0; i < indexLen; i++) { /* ensure this is set */
BLI_assert(index_len != -1);
for (i = 0; i < index_len; i++) {
if (!indexMap[i]) continue; if (!indexMap[i]) continue;
/* merge v (from 'newout') into v2 (from old 'geom') */ /* merge v (from 'newout') into v2 (from old 'geom') */

2
source/blender/modifiers/intern/MOD_mask.c
View File

@@ -179,7 +179,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
} }
/* verthash gives mapping from original vertex indices to the new indices (including selected matches only) /* verthash gives mapping from original vertex indices to the new indices (including selected matches only)
* key=oldindex, value=newindex * key = oldindex, value = newindex
*/ */
vertHash = BLI_ghash_int_new("mask vert gh"); vertHash = BLI_ghash_int_new("mask vert gh");

6
source/tests/CMakeLists.txt
View File

@@ -29,9 +29,9 @@ set(TEST_OUT_DIR ${CMAKE_BINARY_DIR}/tests)
# ugh, any better way to do this on testing only? # ugh, any better way to do this on testing only?
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_OUT_DIR}) execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_OUT_DIR})
#~ if(NOT IS_DIRECTORY ${TEST_SRC_DIR}) #~ if(NOT IS_DIRECTORY ${TEST_SRC_DIR})
#~ message(FATAL_ERROR "CMake test directory not found!") #~ message(FATAL_ERROR "CMake test directory not found!")
#~ endif() #~ endif()
# all calls to blender use this # all calls to blender use this
if(APPLE) if(APPLE)