tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

style cleanup, also remove redundant call to set_listbasepointers in free_main().

This commit is contained in:
Campbell Barton 2012-11-07 01:02:28 +00:00
parent 5cf9d5e4ca
commit 852a41fb0e
8 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/bsp/intern/BOP_CarveInterface.cpp
View File

@ -205,7 +205,7 @@ static void Carve_getIntersectedOperandMeshes(std::vector<MeshSet<3>::mesh_t*> &
std::vector<MeshSet<3>::mesh_t*>::iterator it = meshes.begin();
std::vector< RTreeNode<3, Face<3> *> *> meshRTree;
while(it != meshes.end()) {
while (it != meshes.end()) {
MeshSet<3>::mesh_t *mesh = *it;
bool isAdded = false;
@ -279,7 +279,7 @@ static MeshSet<3> *Carve_unionIntersectingMeshes(MeshSet<3> *poly,
return poly;
}
while(orig_meshes.size()) {
while (orig_meshes.size()) {
MeshSet<3> *right = Carve_getIntersectedOperand(orig_meshes, otherAABB);
if (!right) {

3
source/blender/blenkernel/intern/depsgraph.c
View File

@ -400,7 +400,8 @@ static void dag_add_material_driver_relations(DagForest *dag, DagNode *node, Mat
}
}
static void dag_add_collision_field_relation(DagForest *dag, Scene *scene, Object *ob, DagNode *node, int skip_forcefield){
static void dag_add_collision_field_relation(DagForest *dag, Scene *scene, Object *ob, DagNode *node, int skip_forcefield)
{
Base *base;
DagNode *node2;

1
source/blender/blenkernel/intern/library.c
View File

@ -998,7 +998,6 @@ void free_main(Main *mainvar)
#endif
}
}
a = set_listbasepointers(mainvar, lbarray);
MEM_freeN(mainvar);
}

3
source/blender/blenkernel/intern/smoke.c
View File

@ -2267,7 +2267,8 @@ static void smokeModifier_process(SmokeModifierData *smd, Scene *scene, Object *
}
}
struct DerivedMesh *smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedMesh *dm){
struct DerivedMesh *smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedMesh *dm)
{
smokeModifier_process(smd, scene, ob, dm);
/* return generated geometry for adaptive domain */

10
source/blender/editors/space_node/drawnode.c
View File

@ -1420,10 +1420,10 @@ static void node_shader_buts_normal_map(uiLayout *layout, bContext *C, PointerRN
{
uiItemR(layout, ptr, "space", 0, "", 0);
if(RNA_enum_get(ptr, "space") == SHD_NORMAL_MAP_TANGENT) {
if (RNA_enum_get(ptr, "space") == SHD_NORMAL_MAP_TANGENT) {
PointerRNA obptr = CTX_data_pointer_get(C, "active_object");
if(obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
if (obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
PointerRNA dataptr = RNA_pointer_get(&obptr, "data");
uiItemPointerR(layout, ptr, "uv_map", &dataptr, "uv_textures", "", ICON_NONE);
}
@ -1442,10 +1442,10 @@ static void node_shader_buts_tangent(uiLayout *layout, bContext *C, PointerRNA *
row = uiLayoutRow(split, FALSE);
if(RNA_enum_get(ptr, "direction_type") == SHD_TANGENT_UVMAP) {
if (RNA_enum_get(ptr, "direction_type") == SHD_TANGENT_UVMAP) {
PointerRNA obptr = CTX_data_pointer_get(C, "active_object");
if(obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
if (obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
PointerRNA dataptr = RNA_pointer_get(&obptr, "data");
uiItemPointerR(row, ptr, "uv_map", &dataptr, "uv_textures", "", ICON_NONE);
}
@ -1485,7 +1485,7 @@ static void node_shader_buts_script_details(uiLayout *layout, bContext *C, Point
node_shader_buts_script(layout, C, ptr);
/* not implemented yet
if(RNA_enum_get(ptr, "mode") == NODE_SCRIPT_EXTERNAL)
if (RNA_enum_get(ptr, "mode") == NODE_SCRIPT_EXTERNAL)
uiItemR(layout, ptr, "use_auto_update", 0, NULL, ICON_NONE);*/
}

2
source/blender/imbuf/intern/colormanagement.c
View File

@ -2385,7 +2385,7 @@ void IMB_partial_display_buffer_update(ImBuf *ibuf, const float *linear_buffer,
const ColorManagedDisplaySettings *display_settings,
int xmin, int ymin, int xmax, int ymax, int update_orig_byte_buffer)
{
if ((ibuf->rect && ibuf->rect_float) || update_orig_byte_buffer) {
if ((ibuf->rect && ibuf->rect_float) || update_orig_byte_buffer) {
/* update byte buffer created by legacy color management */
unsigned char *rect = (unsigned char *) ibuf->rect;

2
source/blender/nodes/shader/nodes/node_shader_script.c
View File

@ -64,7 +64,7 @@ static void node_copy_script(bNode *orig_node, bNode *new_node)
NodeShaderScript *orig_nss = orig_node->storage;
NodeShaderScript *new_nss = MEM_dupallocN(orig_nss);
if(orig_nss->bytecode)
if (orig_nss->bytecode)
new_nss->bytecode = MEM_dupallocN(orig_nss->bytecode);
if (orig_nss->prop)

2
source/blender/render/intern/source/external_engine.c
View File

@ -306,7 +306,7 @@ void RE_engine_report(RenderEngine *engine, int type, const char *msg)
if (re)
BKE_report(engine->re->reports, type, msg);
else if(engine->reports)
else if (engine->reports)
BKE_report(engine->reports, type, msg);
}