Revision: 47644
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47644
Author: campbellbarton
Date: 2012-06-09 17:22:52 +0000 (Sat, 09 Jun 2012)
Log Message:
-----------
style cleanup: block comments
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/blender_camera.cpp
trunk/blender/intern/cycles/blender/blender_mesh.cpp
trunk/blender/intern/cycles/blender/blender_object.cpp
trunk/blender/intern/cycles/blender/blender_session.cpp
trunk/blender/intern/cycles/blender/blender_shader.cpp
trunk/blender/intern/cycles/blender/blender_sync.cpp
trunk/blender/intern/cycles/blender/blender_util.h
trunk/blender/intern/cycles/bvh/bvh.cpp
trunk/blender/intern/cycles/bvh/bvh.h
trunk/blender/intern/cycles/bvh/bvh_binning.cpp
trunk/blender/intern/cycles/bvh/bvh_sort.h
trunk/blender/intern/cycles/device/device.cpp
trunk/blender/intern/cycles/device/device_cpu.cpp
trunk/blender/intern/cycles/device/device_cuda.cpp
trunk/blender/intern/cycles/device/device_network.h
trunk/blender/intern/cycles/device/device_opencl.cpp
trunk/blender/intern/cycles/kernel/kernel_accumulate.h
trunk/blender/intern/cycles/kernel/kernel_bvh.h
trunk/blender/intern/cycles/kernel/kernel_compat_cpu.h
trunk/blender/intern/cycles/kernel/kernel_emission.h
trunk/blender/intern/cycles/kernel/kernel_globals.h
trunk/blender/intern/cycles/kernel/kernel_light.h
trunk/blender/intern/cycles/kernel/kernel_montecarlo.h
trunk/blender/intern/cycles/kernel/kernel_optimized.cpp
trunk/blender/intern/cycles/kernel/kernel_path.h
trunk/blender/intern/cycles/kernel/kernel_projection.h
trunk/blender/intern/cycles/kernel/kernel_random.h
trunk/blender/intern/cycles/kernel/kernel_triangle.h
trunk/blender/intern/cycles/kernel/osl/nodes/node_fresnel.h
trunk/blender/intern/cycles/kernel/osl/osl_services.cpp
trunk/blender/intern/cycles/kernel/osl/osl_services.h
trunk/blender/intern/cycles/kernel/svm/bsdf.h
trunk/blender/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
trunk/blender/intern/cycles/kernel/svm/bsdf_diffuse.h
trunk/blender/intern/cycles/kernel/svm/bsdf_microfacet.h
trunk/blender/intern/cycles/kernel/svm/bsdf_reflection.h
trunk/blender/intern/cycles/kernel/svm/bsdf_refraction.h
trunk/blender/intern/cycles/kernel/svm/bsdf_transparent.h
trunk/blender/intern/cycles/kernel/svm/bsdf_ward.h
trunk/blender/intern/cycles/kernel/svm/bsdf_westin.h
trunk/blender/intern/cycles/kernel/svm/emissive.h
trunk/blender/intern/cycles/kernel/svm/svm_closure.h
trunk/blender/intern/cycles/kernel/svm/svm_image.h
trunk/blender/intern/cycles/kernel/svm/svm_noise.h
trunk/blender/intern/cycles/kernel/svm/svm_texture.h
trunk/blender/intern/cycles/kernel/svm/volume.h
trunk/blender/intern/cycles/render/buffers.h
trunk/blender/intern/cycles/render/film.cpp
trunk/blender/intern/cycles/render/graph.cpp
trunk/blender/intern/cycles/render/image.cpp
trunk/blender/intern/cycles/render/light.cpp
trunk/blender/intern/cycles/render/mesh.cpp
trunk/blender/intern/cycles/render/object.cpp
trunk/blender/intern/cycles/render/osl.cpp
trunk/blender/intern/cycles/render/session.cpp
trunk/blender/intern/cycles/render/shader.cpp
trunk/blender/intern/cycles/render/shader.h
trunk/blender/intern/cycles/render/svm.cpp
trunk/blender/intern/cycles/subd/subd_build.cpp
trunk/blender/intern/cycles/subd/subd_dice.cpp
trunk/blender/intern/cycles/subd/subd_ring.cpp
trunk/blender/intern/cycles/util/util_cuda.cpp
trunk/blender/intern/cycles/util/util_md5.cpp
trunk/blender/intern/cycles/util/util_opencl.h
trunk/blender/intern/cycles/util/util_path.cpp
trunk/blender/intern/cycles/util/util_system.cpp
trunk/blender/intern/cycles/util/util_task.cpp
trunk/blender/intern/cycles/util/util_thread.h
trunk/blender/intern/cycles/util/util_transform.cpp
trunk/blender/intern/cycles/util/util_transform.h
Modified: trunk/blender/intern/cycles/blender/blender_camera.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_camera.cpp 2012-06-09
17:15:38 UTC (rev 47643)
+++ trunk/blender/intern/cycles/blender/blender_camera.cpp 2012-06-09
17:22:52 UTC (rev 47644)
@@ -141,7 +141,7 @@
bcam->lens = b_camera.lens();
/* allow f/stop number to change aperture_size but still
- give manual control over aperture radius */
+ * give manual control over aperture radius */
int aperture_type = RNA_enum_get(&ccamera, "aperture_type");
if(aperture_type == 1) {
@@ -179,8 +179,8 @@
if(type == CAMERA_PANORAMA) {
/* make it so environment camera needs to be pointed in the
direction
- of the positive x-axis to match an environment texture, this
way
- it is looking at the center of the texture */
+ * of the positive x-axis to match an environment texture, this
way
+ * it is looking at the center of the texture */
result = tfm *
make_transform( 0.0f, -1.0f, 0.0f, 0.0f,
0.0f, 0.0f, 1.0f, 0.0f,
Modified: trunk/blender/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_mesh.cpp 2012-06-09
17:15:38 UTC (rev 47643)
+++ trunk/blender/intern/cycles/blender/blender_mesh.cpp 2012-06-09
17:22:52 UTC (rev 47644)
@@ -68,8 +68,8 @@
}
/* create generated coordinates. todo: we should actually get the orco
- coordinates from modifiers, for now we use texspace loc/size which
- is available in the api. */
+ * coordinates from modifiers, for now we use texspace loc/size which
+ * is available in the api. */
if(mesh->need_attribute(scene, ATTR_STD_GENERATED)) {
Attribute *attr = mesh->attributes.add(ATTR_STD_GENERATED);
float3 loc = get_float3(b_mesh.texspace_location());
@@ -181,8 +181,10 @@
if(n == 4)
sdmesh.add_face(vi[0], vi[1], vi[2], vi[3]);
- /*else
- sdmesh.add_face(vi[0], vi[1], vi[2]);*/
+#if 0
+ else
+ sdmesh.add_face(vi[0], vi[1], vi[2]);
+#endif
}
/* finalize subd mesh */
@@ -232,7 +234,7 @@
/* if transform was applied to mesh, need full update */
if(object_updated && mesh->transform_applied);
/* test if shaders changed, these can be object level so mesh
- does not get tagged for recalc */
+ * does not get tagged for recalc */
else if(mesh->used_shaders != used_shaders);
else {
/* even if not tagged for recalc, we may need to sync
anyway
Modified: trunk/blender/intern/cycles/blender/blender_object.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_object.cpp 2012-06-09
17:15:38 UTC (rev 47643)
+++ trunk/blender/intern/cycles/blender/blender_object.cpp 2012-06-09
17:22:52 UTC (rev 47644)
@@ -264,7 +264,7 @@
}
/* camera flag is not actually used, instead is tested
- against render layer flags */
+ * against render layer flags */
if(object->visibility & PATH_RAY_CAMERA) {
object->visibility |= layer_flag <<
PATH_RAY_LAYER_SHIFT;
object->visibility &= ~PATH_RAY_CAMERA;
Modified: trunk/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_session.cpp 2012-06-09
17:15:38 UTC (rev 47643)
+++ trunk/blender/intern/cycles/blender/blender_session.cpp 2012-06-09
17:22:52 UTC (rev 47644)
@@ -304,7 +304,7 @@
session->set_pause(BlenderSync::get_session_pause(b_scene, background));
/* copy recalc flags, outside of mutex so we can decide to do the real
- synchronization at a later time to not block on running updates */
+ * synchronization at a later time to not block on running updates */
sync->sync_recalc();
/* try to acquire mutex. if we don't want to or can't, come back later
*/
@@ -334,7 +334,7 @@
bool BlenderSession::draw(int w, int h)
{
/* before drawing, we verify camera and viewport size changes, because
- we do not get update callbacks for those, we must detect them here */
+ * we do not get update callbacks for those, we must detect them here */
if(session->ready_to_reset()) {
bool reset = false;
@@ -429,7 +429,7 @@
{
if(background) {
/* update stats and progress, only for background here because
- in 3d view we do it in draw for thread safety reasons */
+ * in 3d view we do it in draw for thread safety reasons */
update_status_progress();
/* offline render, redraw if timeout passed */
Modified: trunk/blender/intern/cycles/blender/blender_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_shader.cpp 2012-06-09
17:15:38 UTC (rev 47643)
+++ trunk/blender/intern/cycles/blender/blender_shader.cpp 2012-06-09
17:22:52 UTC (rev 47644)
@@ -641,7 +641,7 @@
to_pair = sockets_map[b_to_sock.ptr.data];
/* either node may be NULL when the node was not exported,
typically
- because the node type is not supported */
+ * because the node type is not supported */
if(from_pair.first && to_pair.first) {
ShaderOutput *output =
from_pair.first->output(from_pair.second.c_str());
ShaderInput *input =
to_pair.first->input(to_pair.second.c_str());
Modified: trunk/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.cpp 2012-06-09
17:15:38 UTC (rev 47643)
+++ trunk/blender/intern/cycles/blender/blender_sync.cpp 2012-06-09
17:22:52 UTC (rev 47644)
@@ -63,7 +63,7 @@
bool BlenderSync::sync_recalc()
{
/* sync recalc flags from blender to cycles. actual update is done
separate,
- so we can do it later on if doing it immediate is not suitable */
+ * so we can do it later on if doing it immediate is not suitable */
BL::BlendData::materials_iterator b_mat;
Modified: trunk/blender/intern/cycles/blender/blender_util.h
===================================================================
--- trunk/blender/intern/cycles/blender/blender_util.h 2012-06-09 17:15:38 UTC
(rev 47643)
+++ trunk/blender/intern/cycles/blender/blender_util.h 2012-06-09 17:22:52 UTC
(rev 47644)
@@ -27,7 +27,7 @@
#include "util_vector.h"
/* Hacks to hook into Blender API
- todo: clean this up ... */
+ * todo: clean this up ... */
extern "C" {
@@ -121,7 +121,7 @@
Transform tfm;
/* we assume both types to be just 16 floats, and transpose because
blender
- use column major matrix order while we use row major */
+ * use column major matrix order while we use row major */
memcpy(&tfm, &array, sizeof(float)*16);
tfm = transform_transpose(tfm);
@@ -164,12 +164,14 @@
return layer;
}
-/*static inline float3 get_float3(PointerRNA& ptr, const char *name)
+#if 0
+static inline float3 get_float3(PointerRNA& ptr, const char *name)
{
float3 f;
RNA_float_get_array(&ptr, name, &f.x);
return f;
-}*/
+}
+#endif
static inline bool get_boolean(PointerRNA& ptr, const char *name)
{
Modified: trunk/blender/intern/cycles/bvh/bvh.cpp
===================================================================
--- trunk/blender/intern/cycles/bvh/bvh.cpp 2012-06-09 17:15:38 UTC (rev
47643)
+++ trunk/blender/intern/cycles/bvh/bvh.cpp 2012-06-09 17:22:52 UTC (rev
47644)
@@ -292,13 +292,13 @@
void BVH::pack_instances(size_t nodes_size)
{
/* The BVH's for instances are built separately, but for traversal all
- BVH's are stored in global arrays. This function merges them into the
- top level BVH, adjusting indexes and offsets where appropriate. */
+ * BVH's are stored in global arrays. This function merges them into the
+ * top level BVH, adjusting indexes and offsets where appropriate. */
bool use_qbvh = params.use_qbvh;
size_t nsize = (use_qbvh)? BVH_QNODE_SIZE: BVH_NODE_SIZE;
/* adjust primitive index to point to the triangle in the global array,
for
- meshes with transform applied and already in the top level BVH */
+ * meshes with transform applied and already in the top level BVH */
for(size_t i = 0; i < pack.prim_index.size(); i++)
if(pack.prim_index[i] != -1)
pack.prim_index[i] +=
objects[pack.prim_object[i]]->mesh->tri_offset;
@@ -356,14 +356,14 @@
Mesh *mesh = ob->mesh;
/* if mesh transform is applied, that means it's already in the
top
- level BVH, and we don't need to merge it in */
+ * level BVH, and we don't need to merge it in */
if(mesh->transform_applied) {
pack.object_node[object_offset++] = 0;
continue;
}
/* if mesh already added once, don't add it again, but used set
- node offset for this object */
+ * node offset for this object */
map<Mesh*, int>::iterator it = mesh_map.find(mesh);
if(mesh_map.find(mesh) != mesh_map.end()) {
Modified: trunk/blender/intern/cycles/bvh/bvh.h
===================================================================
--- trunk/blender/intern/cycles/bvh/bvh.h 2012-06-09 17:15:38 UTC (rev
47643)
+++ trunk/blender/intern/cycles/bvh/bvh.h 2012-06-09 17:22:52 UTC (rev
47644)
@@ -46,7 +46,7 @@
struct PackedBVH {
/* BVH nodes storage, one node is 4x int4, and contains two bounding
boxes,
- and child, triangle or object indexes dependening on the node type */
+ * and child, triangle or object indexes dependening on the node type */
array<int4> nodes;
/* object index to BVH node index mapping for instances */
array<int> object_node;
@@ -55,12 +55,12 @@
/* visibility visibilitys for primitives */
array<uint> prim_visibility;
/* mapping from BVH primitive index to true primitive index, as
primitives
- may be duplicated due to spatial splits. -1 for instances. */
+ * may be duplicated due to spatial splits. -1 for instances. */
array<int> prim_index;
/* mapping from BVH primitive index, to the object id of that
primitive. */
array<int> prim_object;
/* quick array to lookup if a node is a leaf, not used for traversal,
only
- for instance BVH merging */
+ * for instance BVH merging */
array<int> is_leaf;
/* index of the root node. */
Modified: trunk/blender/intern/cycles/bvh/bvh_binning.cpp
===================================================================
--- trunk/blender/intern/cycles/bvh/bvh_binning.cpp 2012-06-09 17:15:38 UTC
(rev 47643)
+++ trunk/blender/intern/cycles/bvh/bvh_binning.cpp 2012-06-09 17:22:52 UTC
(rev 47644)
@@ -200,7 +200,7 @@
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
