Revision: 45349
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45349
Author: campbellbarton
Date: 2012-04-02 22:26:00 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
stule cleanup: edits for files which were recently cleaned up.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean_util.c
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-04-02 19:38:26 UTC (rev 45348)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-04-02 22:26:00 UTC (rev 45349)
@@ -583,10 +583,11 @@
GPU_normal_setup( dm );
if ( !GPU_buffer_legacy(dm) ) {
glShadeModel(GL_SMOOTH);
- for ( a = 0; a < dm->drawObject->totmaterial; a++ ) {
- if (
setMaterial(dm->drawObject->materials[a].mat_nr+1, NULL) )
+ for (a = 0; a < dm->drawObject->totmaterial; a++) {
+ if
(setMaterial(dm->drawObject->materials[a].mat_nr + 1, NULL)) {
glDrawArrays(GL_TRIANGLES,
dm->drawObject->materials[a].start,
-
dm->drawObject->materials[a].totpoint);
+
dm->drawObject->materials[a].totpoint);
+ }
}
}
GPU_buffer_unbind( );
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-04-02 19:38:26 UTC (rev 45348)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-04-02 22:26:00 UTC (rev 45349)
@@ -1633,7 +1633,7 @@
#pragma omp
parallel for schedule(static)
for (i=0;
i<totpoly; i++) {
int j=0;
-
Material *material = give_current_material(ob, mp[i].mat_nr+1);
+
Material *material = give_current_material(ob, mp[i].mat_nr + 1);
for (;
j<mp[i].totloop; j++) {
int l_index = mp[i].loopstart + j;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-04-02
19:38:26 UTC (rev 45348)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-04-02
22:26:00 UTC (rev 45349)
@@ -440,29 +440,29 @@
* counts number of elements with flag enabled/disabled
*/
static int bm_mesh_flag_count(BMesh *bm, const char htype, const char hflag,
- int respecthide, int
test_for_enabled)
+ int respecthide, int test_for_enabled)
{
BMElem *ele;
BMIter iter;
- int test = (test_for_enabled ? hflag : 0);
+ const char hflag_test = (test_for_enabled ? hflag : 0);
int tot = 0;
if (htype & BM_VERT) {
for (ele = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL); ele;
ele = BM_iter_step(&iter)) {
if (respecthide && BM_elem_flag_test(ele,
BM_ELEM_HIDDEN)) continue;
- if (BM_elem_flag_test(ele, hflag) == test) tot++;
+ if (BM_elem_flag_test(ele, hflag) == hflag_test) tot++;
}
}
if (htype & BM_EDGE) {
for (ele = BM_iter_new(&iter, bm, BM_EDGES_OF_MESH, NULL); ele;
ele = BM_iter_step(&iter)) {
if (respecthide && BM_elem_flag_test(ele,
BM_ELEM_HIDDEN)) continue;
- if (BM_elem_flag_test(ele, hflag) == test) tot++;
+ if (BM_elem_flag_test(ele, hflag) == hflag_test) tot++;
}
}
if (htype & BM_FACE) {
for (ele = BM_iter_new(&iter, bm, BM_FACES_OF_MESH, NULL); ele;
ele = BM_iter_step(&iter)) {
if (respecthide && BM_elem_flag_test(ele,
BM_ELEM_HIDDEN)) continue;
- if (BM_elem_flag_test(ele, hflag) == test) tot++;
+ if (BM_elem_flag_test(ele, hflag) == hflag_test) tot++;
}
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-04-02
19:38:26 UTC (rev 45348)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-04-02
22:26:00 UTC (rev 45349)
@@ -457,7 +457,7 @@
*/
static int bmo_mesh_flag_count(BMesh *bm, const char htype, const short oflag,
- int test_for_enabled)
+ int test_for_enabled)
{
BMIter elements;
int count = 0;
@@ -693,8 +693,8 @@
* enabled/disabled into a slot for an operator.
*/
static void bmo_slot_buffer_from_hflag(BMesh *bm, BMOperator *op, const char
*slotname,
-
const char htype, const char hflag,
- int
test_for_enabled)
+ const char htype, const char hflag,
+ int test_for_enabled)
{
BMIter elements;
BMElem *ele;
@@ -747,13 +747,13 @@
}
void BMO_slot_buffer_from_enabled_hflag(BMesh *bm, BMOperator *op, const char
*slotname,
-
const char htype, const char hflag)
+ const char htype, const char hflag)
{
bmo_slot_buffer_from_hflag(bm, op, slotname, htype, hflag, TRUE);
}
void BMO_slot_buffer_from_disabled_hflag(BMesh *bm, BMOperator *op, const char
*slotname,
-
const char htype, const char hflag)
+ const char htype, const char hflag)
{
bmo_slot_buffer_from_hflag(bm, op, slotname, htype, hflag, FALSE);
}
@@ -797,8 +797,8 @@
* into an output slot for an operator.
*/
static void bmo_slot_buffer_from_flag(BMesh *bm, BMOperator *op, const char
*slotname,
- const
char htype, const short oflag,
- int
test_for_enabled)
+ const char htype, const short oflag,
+ int test_for_enabled)
{
BMIter elements;
BMOpSlot *slot = BMO_slot_get(op, slotname);
@@ -807,14 +807,14 @@
if (test_for_enabled)
totelement = BMO_mesh_enabled_flag_count(bm, htype, oflag);
else
- totelement = BMO_mesh_disabled_flag_count(bm, htype, oflag);
+ totelement = BMO_mesh_disabled_flag_count(bm, htype, oflag);
BLI_assert(slot->slottype == BMO_OP_SLOT_ELEMENT_BUF);
if (totelement) {
BMHeader *ele;
BMHeader **ele_array;
- int test = (test_for_enabled ? oflag : 0);
+ const char hflag_test = (test_for_enabled ? oflag : 0);
bmo_slot_buffer_alloc(op, slotname, totelement);
@@ -822,7 +822,7 @@
if (htype & BM_VERT) {
for (ele = BM_iter_new(&elements, bm, BM_VERTS_OF_MESH,
bm); ele; ele = BM_iter_step(&elements)) {
- if (BMO_elem_flag_test(bm, (BMElemF *)ele,
oflag) == test) {
+ if (BMO_elem_flag_test(bm, (BMElemF *)ele,
oflag) == hflag_test) {
ele_array[i] = ele;
i++;
}
@@ -831,7 +831,7 @@
if (htype & BM_EDGE) {
for (ele = BM_iter_new(&elements, bm, BM_EDGES_OF_MESH,
bm); ele; ele = BM_iter_step(&elements)) {
- if (BMO_elem_flag_test(bm, (BMElemF *)ele,
oflag) == test) {
+ if (BMO_elem_flag_test(bm, (BMElemF *)ele,
oflag) == hflag_test) {
ele_array[i] = ele;
i++;
}
@@ -840,7 +840,7 @@
if (htype & BM_FACE) {
for (ele = BM_iter_new(&elements, bm, BM_FACES_OF_MESH,
bm); ele; ele = BM_iter_step(&elements)) {
- if (BMO_elem_flag_test(bm, (BMElemF *)ele,
oflag) == test) {
+ if (BMO_elem_flag_test(bm, (BMElemF *)ele,
oflag) == hflag_test) {
ele_array[i] = ele;
i++;
}
@@ -853,13 +853,13 @@
}
void BMO_slot_buffer_from_enabled_flag(BMesh *bm, BMOperator *op, const char
*slotname,
-
const char htype, const short oflag)
+ const char htype, const short oflag)
{
bmo_slot_buffer_from_flag(bm, op, slotname, htype, oflag, TRUE);
}
void BMO_slot_buffer_from_disabled_flag(BMesh *bm, BMOperator *op, const char
*slotname,
-
const char htype, const short oflag)
+ const char htype, const short oflag)
{
bmo_slot_buffer_from_flag(bm, op, slotname, htype, oflag, FALSE);
}
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
2012-04-02 19:38:26 UTC (rev 45348)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
2012-04-02 22:26:00 UTC (rev 45349)
@@ -531,7 +531,7 @@
if (scene_use_new_shading_nodes(s->scene)) {
MFace *mf = &s->dm_mface[face_index];
- ED_object_get_active_image(s->ob, mf->mat_nr+1, &ima, NULL,
NULL);
+ ED_object_get_active_image(s->ob, mf->mat_nr + 1, &ima, NULL,
NULL);
}
else {
MTFace *tf = &s->dm_mtface[face_index];
@@ -547,7 +547,7 @@
if (ps->do_new_shading_nodes) { /* cached scene_use_new_shading_nodes
result */
MFace *mf = ps->dm_mface + face_index;
- ED_object_get_active_image(ps->ob, mf->mat_nr+1, &ima, NULL,
NULL);
+ ED_object_get_active_image(ps->ob, mf->mat_nr + 1, &ima, NULL,
NULL);
}
else {
ima = dm_mtface[face_index].tpage;
Modified: trunk/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/space_image.c
2012-04-02 19:38:26 UTC (rev 45348)
+++ trunk/blender/source/blender/editors/space_image/space_image.c
2012-04-02 22:26:00 UTC (rev 45349)
@@ -603,7 +603,7 @@
if (efa) {
Image *node_ima;
- ED_object_get_active_image(obedit,
efa->mat_nr+1, &node_ima, NULL, NULL);
+ ED_object_get_active_image(obedit, efa->mat_nr
+ 1, &node_ima, NULL, NULL);
if (node_ima)
sima->image = node_ima;
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2012-04-02
19:38:26 UTC (rev 45348)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2012-04-02
22:26:00 UTC (rev 45349)
@@ -191,7 +191,7 @@
BMFace *efa= BM_active_face_get(em->bm, sloppy);
if (efa)
- ED_object_assign_active_image(bmain, obedit,
efa->mat_nr+1, ima);
+ ED_object_assign_active_image(bmain, obedit,
efa->mat_nr + 1, ima);
}
else {
/* old shading system, assign image to selected faces */
Modified: trunk/blender/source/blender/gpu/intern/gpu_buffers.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_buffers.c 2012-04-02
19:38:26 UTC (rev 45348)
+++ trunk/blender/source/blender/gpu/intern/gpu_buffers.c 2012-04-02
22:26:00 UTC (rev 45349)
@@ -1774,7 +1774,7 @@
if (buffers->totface) {
const MFace *f = &buffers->mface[buffers->face_indices[0]];
- if (!setMaterial(f->mat_nr+1, NULL))
+ if (!setMaterial(f->mat_nr + 1, NULL))
return;
smooth = f->flag & ME_SMOOTH;
@@ -1782,7 +1782,7 @@
}
else if (buffers->totgrid) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
