[Bf-blender-cvs] [a11e61a] openvdb: Cleanup: indent

Kévin Dietrich noreply at git.blender.org
Fri Jun 5 14:07:43 CEST 2015


Commit: a11e61a3c75f8ce2bf981d7a537338b5df91c949
Author: Kévin Dietrich
Date:   Sat May 23 03:59:31 2015 +0200
Branches: openvdb
https://developer.blender.org/rBa11e61a3c75f8ce2bf981d7a537338b5df91c949

Cleanup: indent

===================================================================

M	intern/openvdb/CMakeLists.txt
M	intern/openvdb/intern/openvdb_smoke_export.cpp
M	intern/openvdb/intern/openvdb_writer.cpp
M	intern/openvdb/intern/openvdb_writer.h
M	source/blender/editors/object/object_modifier.c
M	source/blender/makesrna/intern/rna_smoke.c
M	source/blender/python/intern/bpy_app.c
M	source/blender/python/intern/bpy_app_build_options.c

===================================================================

diff --git a/intern/openvdb/CMakeLists.txt b/intern/openvdb/CMakeLists.txt
index e072a0e..33dce2f 100644
--- a/intern/openvdb/CMakeLists.txt
+++ b/intern/openvdb/CMakeLists.txt
@@ -24,13 +24,13 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-    .
-    intern
-    ../guardedalloc
-    ../../source/blender/blenkernel
-    ../../source/blender/blenlib
-    ../../source/blender/makesdna
-    ../../source/blender/makesrna
+	.
+	intern
+	../guardedalloc
+	../../source/blender/blenkernel
+	../../source/blender/blenlib
+	../../source/blender/makesdna
+	../../source/blender/makesrna
 )
 
 set(INC_SYS
@@ -38,29 +38,28 @@ set(INC_SYS
 )
 
 set(SRC
-    openvdb_capi.h
+	openvdb_capi.h
 )
 
 if(WITH_OPENVDB)
-    add_definitions(
-        -DWITH_OPENVDB
-		-DDDF_DEBUG=0
-    )
+	add_definitions(
+		-DWITH_OPENVDB
+	)
 
-    list(APPEND INC_SYS
-        ${OPENEXR_INCLUDE_DIRS}
-        ${OPENVDB_INCLUDE_DIRS}
-    )
+	list(APPEND INC_SYS
+		${OPENEXR_INCLUDE_DIRS}
+		${OPENVDB_INCLUDE_DIRS}
+	)
 
-    list(APPEND SRC
+	list(APPEND SRC
 		intern/openvdb_reader.cpp
 		intern/openvdb_smoke_export.cpp
 		intern/openvdb_writer.cpp
-        openvdb_capi.cpp
+		openvdb_capi.cpp
 		openvdb_util.cpp
 
-        openvdb_intern.h
-    )
+		openvdb_intern.h
+	)
 endif()
 
 blender_add_lib(bf_intern_openvdb "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/openvdb/intern/openvdb_smoke_export.cpp b/intern/openvdb/intern/openvdb_smoke_export.cpp
index 132f052..c0096aa 100644
--- a/intern/openvdb/intern/openvdb_smoke_export.cpp
+++ b/intern/openvdb/intern/openvdb_smoke_export.cpp
@@ -74,10 +74,10 @@ void OpenVDB_export_vector_grid(OpenVDBWriter *writer,
 	math::CoordBBox bbox(Coord(0), Coord(res[0] - 1, res[1] - 1, res[2] - 1));
 
 	Mat4R mat = Mat4R(
-		  fluid_mat[0][0], fluid_mat[0][1], fluid_mat[0][2], fluid_mat[0][3],
-          fluid_mat[1][0], fluid_mat[1][1], fluid_mat[1][2], fluid_mat[1][3],
-          fluid_mat[2][0], fluid_mat[2][1], fluid_mat[2][2], fluid_mat[2][3],
-          fluid_mat[3][0], fluid_mat[3][1], fluid_mat[3][2], fluid_mat[3][3]);
+	    fluid_mat[0][0], fluid_mat[0][1], fluid_mat[0][2], fluid_mat[0][3],
+	    fluid_mat[1][0], fluid_mat[1][1], fluid_mat[1][2], fluid_mat[1][3],
+	    fluid_mat[2][0], fluid_mat[2][1], fluid_mat[2][2], fluid_mat[2][3],
+	    fluid_mat[3][0], fluid_mat[3][1], fluid_mat[3][2], fluid_mat[3][3]);
 
 	math::Transform::Ptr transform = math::Transform::createLinearTransform(mat);
 
@@ -128,10 +128,10 @@ public:
 		m_grid_z = FloatGrid::create(bg.z());
 
 		if (math::Transform::Ptr xform = vecgrid->transform().copy()) {
-            m_grid_x->setTransform(xform);
-            m_grid_y->setTransform(xform);
-            m_grid_z->setTransform(xform);
-        }
+			m_grid_x->setTransform(xform);
+			m_grid_y->setTransform(xform);
+			m_grid_z->setTransform(xform);
+		}
 
 		FloatGrid::Accessor acc_x = m_grid_x->getAccessor(),
 		                    acc_y = m_grid_y->getAccessor(),
@@ -139,21 +139,21 @@ public:
 
 		CoordBBox bbox;
 		for (Vec3SGrid::ValueOnCIter it = vecgrid->cbeginValueOn(); it; ++it) {
-            if (!it.getBoundingBox(bbox)) continue;
+			if (!it.getBoundingBox(bbox)) continue;
 
-            const Vec3s &val = it.getValue();
+			const Vec3s &val = it.getValue();
 
-            if (it.isTileValue()) {
-                m_grid_x->fill(bbox, val.x());
-                m_grid_y->fill(bbox, val.y());
-                m_grid_z->fill(bbox, val.z());
-            }
+			if (it.isTileValue()) {
+				m_grid_x->fill(bbox, val.x());
+				m_grid_y->fill(bbox, val.y());
+				m_grid_z->fill(bbox, val.z());
+			}
 			else {
-                acc_x.setValueOn(bbox.min(), val.x());
-                acc_y.setValueOn(bbox.min(), val.y());
-                acc_z.setValueOn(bbox.min(), val.z());
-            }
-        }
+				acc_x.setValueOn(bbox.min(), val.x());
+				acc_y.setValueOn(bbox.min(), val.y());
+				acc_z.setValueOn(bbox.min(), val.z());
+			}
+		}
 	}
 
 	const FloatGrid::Ptr &grid_x() { return m_grid_x; }
diff --git a/intern/openvdb/intern/openvdb_writer.cpp b/intern/openvdb/intern/openvdb_writer.cpp
index dc3e1a7..37cd28e 100644
--- a/intern/openvdb/intern/openvdb_writer.cpp
+++ b/intern/openvdb/intern/openvdb_writer.cpp
@@ -67,10 +67,10 @@ void OpenVDBWriter::insertVec3IMeta(const std::string &name, const openvdb::Vec3
 void OpenVDBWriter::insertMat4sMeta(const std::string &name, const float value[4][4])
 {
 	openvdb::Mat4s mat = openvdb::Mat4s(
-			value[0][0], value[0][1], value[0][2], value[0][3],
-	        value[1][0], value[1][1], value[1][2], value[1][3],
-	        value[2][0], value[2][1], value[2][2], value[2][3],
-	        value[3][0], value[3][1], value[3][2], value[3][3]);
+	    value[0][0], value[0][1], value[0][2], value[0][3],
+	    value[1][0], value[1][1], value[1][2], value[1][3],
+	    value[2][0], value[2][1], value[2][2], value[2][3],
+	    value[3][0], value[3][1], value[3][2], value[3][3]);
 
 	m_meta_map.insertMeta(name, openvdb::Mat4SMetadata(mat));
 }
diff --git a/intern/openvdb/intern/openvdb_writer.h b/intern/openvdb/intern/openvdb_writer.h
index e34f60a..e710397 100644
--- a/intern/openvdb/intern/openvdb_writer.h
+++ b/intern/openvdb/intern/openvdb_writer.h
@@ -38,8 +38,8 @@ public:
 	OpenVDBWriter();
 	~OpenVDBWriter();
 
-    void insert(const openvdb::GridBase::Ptr &grid);
-    void insert(const openvdb::GridBase &grid);
+	void insert(const openvdb::GridBase::Ptr &grid);
+	void insert(const openvdb::GridBase &grid);
 
 	void insertFloatMeta(const std::string &name, const float value);
 	void insertIntMeta(const std::string &name, const int value);
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 43d8f65..cd349d7 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -2479,176 +2479,176 @@ void OBJECT_OT_smoke_vdb_transform_update(wmOperatorType *ot)
 
 OpenVDBCache *BKE_openvdb_get_current_cache(SmokeDomainSettings *sds)
 {
-    OpenVDBCache *cache = sds->vdb_caches.first;
+	OpenVDBCache *cache = sds->vdb_caches.first;
 
-    for (; cache; cache = cache->next) {
-        if (cache->flag & VDB_CACHE_CURRENT) {
-            break;
-        }
-    }
+	for (; cache; cache = cache->next) {
+		if (cache->flag & VDB_CACHE_CURRENT) {
+			break;
+		}
+	}
 
-    return cache;
+	return cache;
 }
 
 static OpenVDBCache *openvdb_cache_new(void)
 {
-    OpenVDBCache *cache = NULL;
+	OpenVDBCache *cache = NULL;
 
-    cache = MEM_callocN(sizeof(OpenVDBCache), "OpenVDBCache");
+	cache = MEM_callocN(sizeof(OpenVDBCache), "OpenVDBCache");
 	cache->reader = NULL;
 	cache->writer = OpenVDBWriter_create();
-    cache->startframe = 1;
-    cache->endframe = 250;
+	cache->startframe = 1;
+	cache->endframe = 250;
 	cache->compression = VDB_COMPRESSION_ZIP;
 
 	BLI_strncpy(cache->name, "openvdb_smoke_export_", sizeof(cache->name));
 
-    return cache;
+	return cache;
 }
 
 static int openvdb_cache_add_exec(bContext *C, wmOperator *op)
 {
-    Object *ob = ED_object_active_context(C);
-    SmokeModifierData *smd = (SmokeModifierData *)modifiers_findByType(ob, eModifierType_Smoke);
+	Object *ob = ED_object_active_context(C);
+	SmokeModifierData *smd = (SmokeModifierData *)modifiers_findByType(ob, eModifierType_Smoke);
 	SmokeDomainSettings *sds = smd->domain;
-    OpenVDBCache *cache, *cache_new;
+	OpenVDBCache *cache, *cache_new;
 
-    if (!smd) {
-        return OPERATOR_CANCELLED;
-    }
+	if (!smd) {
+		return OPERATOR_CANCELLED;
+	}
 
-    cache = BKE_openvdb_get_current_cache(sds);
+	cache = BKE_openvdb_get_current_cache(sds);
 
-    if (cache) {
-        cache->flag &= ~VDB_CACHE_CURRENT;
-    }
+	if (cache) {
+		cache->flag &= ~VDB_CACHE_CURRENT;
+	}
 
-    cache_new = openvdb_cache_new();
-    cache_new->flag |= VDB_CACHE_CURRENT;
+	cache_new = openvdb_cache_new();
+	cache_new->flag |= VDB_CACHE_CURRENT;
 
-    BLI_addtail(&sds->vdb_caches, cache_new);
+	BLI_addtail(&sds->vdb_caches, cache_new);
 
-    DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-    WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
+	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
-    return OPERATOR_FINISHED;
+	return OPERATOR_FINISHED;
 
 	UNUSED_VARS(op);
 }
 
 void OBJECT_OT_openvdb_cache_add(wmOperatorType *ot)
 {
-    /* identifiers */
-    ot->name = "Add an OpenVDB cache";
-    ot->description = "Add an OpenVDB cache";
-    ot->idname = "OBJECT_OT_openvdb_cache_add";
+	/* identifiers */
+	ot->name = "Add an OpenVDB cache";
+	ot->description = "Add an OpenVDB cache";
+	ot->idname = "OBJECT_OT_openvdb_cache_add";
 
-    /* api callbacks */
-    ot->poll = ED_operator_object_active_editable;
-    ot->exec = openvdb_cache_add_exec;
+	/* api callbacks */
+	ot->poll = ED_operator_object_active_editable;
+	ot->exec = openvdb_cache_add_exec;
 
-    /* flags */
-    ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
 static int openvdb_cache_remove_exec(bContext *C, wmOperator *op)
 {
-    Object *ob = ED_object_active_context(C);
+	Object *ob = ED_object_active_context(C);
 	SmokeModifierData *smd = (SmokeModifierData *)modifiers_findByType(ob, eModifierType_Smoke);
 	SmokeDomainSettings *sds = smd->domain;
-    OpenVDBCache *cache, *cache_prev = NULL;
+	OpenVDBCache *cache, *cache_prev = NULL;
 
-    if (!smd) {
-        return OPERATOR_CANCELLED;
-    }
+	if (!smd) {
+		return OPERATOR_CANCELLED;
+	}
 
-    cache = BKE_openvdb_get_current_cache(sds);
+	cache = BKE_openvdb_get_current_cache(sds);
 
-    if (cache) {
-        cache_prev = cache->prev;
-        BLI_remlink(&sds->vdb_caches, cache);
-        MEM_freeN(cache);
-    }
+	if (cache) {
+		cache_prev = cache->prev;
+		BLI_remlink(&sds->vdb_caches, cache);
+		MEM_freeN(cache);
+	}
 
-    if (cache_prev) {
-        cache_prev->flag |= VDB_CACHE_CURRENT;
-    }
+	if (cache_prev) {
+		cache_prev->flag |= VDB_CACHE_CURRENT;
+	}
 
-    DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
-    return OPERATOR_FINISHED;
+	return OPERATOR_FINISHED;
 
 	UNUSED_VARS(op);
 }
 
 void OBJECT_OT_openv

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list