Cycles: add utility functions for zero float2/float3/float4/transform

Ref D8237, T78710

6 files changed, 13 insertions, 13 deletions

diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp
index c1da9f1983f..b31841801d8 100644
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/blender_camera.cpp
@@ -112,7 +112,7 @@ static void blender_camera_init(BlenderCamera *bcam, BL::RenderSettings &b_rende
   bcam->focaldistance = 10.0f;
 
   bcam->zoom = 1.0f;
-  bcam->pixelaspect = make_float2(1.0f, 1.0f);
+  bcam->pixelaspect = one_float2();
   bcam->aperture_ratio = 1.0f;
 
   bcam->sensor_width = 36.0f;
diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp
index 4fb5c7f57d1..7fe49a6c63b 100644
--- a/intern/cycles/blender/blender_curves.cpp
+++ b/intern/cycles/blender/blender_curves.cpp
@@ -121,8 +121,8 @@ static bool ObtainCacheParticleData(
           CData->curve_firstkey.push_back_slow(keyno);
 
           float curve_length = 0.0f;
-          float3 prev_co_world = make_float3(0.0f, 0.0f, 0.0f);
-          float3 prev_co_object = make_float3(0.0f, 0.0f, 0.0f);
+          float3 prev_co_world = zero_float3();
+          float3 prev_co_object = zero_float3();
           for (int step_no = 0; step_no < ren_step; step_no++) {
             float3 co_world = prev_co_world;
             b_psys.co_hair(*b_ob, pa_no, step_no, &co_world.x);
@@ -197,7 +197,7 @@ static bool ObtainCacheParticleUV(Hair *hair,
           BL::Mesh::uv_layers_iterator l;
           b_mesh->uv_layers.begin(l);
 
-          float2 uv = make_float2(0.0f, 0.0f);
+          float2 uv = zero_float2();
           if (b_mesh->uv_layers.length())
             b_psys.uv_on_emitter(psmd, *b_pa, pa_no, uv_num, &uv.x);
           CData->curve_uv.push_back_slow(uv);
@@ -678,7 +678,7 @@ static void export_hair_curves(Scene *scene, Hair *hair, BL::Hair b_hair)
     const int first_point_index = b_curve.first_point_index();
     const int num_points = b_curve.num_points();
 
-    float3 prev_co = make_float3(0.0f, 0.0f, 0.0f);
+    float3 prev_co = zero_float3();
     float length = 0.0f;
     if (attr_intercept) {
       points_length.clear();
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index e2b18c22d95..14bdcd843e9 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -716,7 +716,7 @@ static void attr_create_pointiness(Scene *scene, Mesh *mesh, BL::Mesh &b_mesh, b
   /* STEP 2: Calculate vertex normals taking into account their possible
    *         duplicates which gets "welded" together.
    */
-  vector<float3> vert_normal(num_verts, make_float3(0.0f, 0.0f, 0.0f));
+  vector<float3> vert_normal(num_verts, zero_float3());
   /* First we accumulate all vertex normals in the original index. */
   for (int vert_index = 0; vert_index < num_verts; ++vert_index) {
     const float3 normal = get_float3(b_mesh.vertices[vert_index].normal());
@@ -733,7 +733,7 @@ static void attr_create_pointiness(Scene *scene, Mesh *mesh, BL::Mesh &b_mesh, b
   /* STEP 3: Calculate pointiness using single ring neighborhood. */
   vector<int> counter(num_verts, 0);
   vector<float> raw_data(num_verts, 0.0f);
-  vector<float3> edge_accum(num_verts, make_float3(0.0f, 0.0f, 0.0f));
+  vector<float3> edge_accum(num_verts, zero_float3());
   BL::Mesh::edges_iterator e;
   EdgeMap visited_edges;
   int edge_index = 0;
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index f0460b129c2..54128cf82fc 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -323,8 +323,8 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
       object->set_random_id(b_instance.random_id());
     }
     else {
-      object->set_dupli_generated(make_float3(0.0f, 0.0f, 0.0f));
-      object->set_dupli_uv(make_float2(0.0f, 0.0f));
+      object->set_dupli_generated(zero_float3());
+      object->set_dupli_uv(zero_float2());
       object->set_random_id(hash_uint2(hash_string(object->name.c_str()), 0));
     }
 
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index 02a6638b083..a1ab5277744 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -1404,7 +1404,7 @@ void BlenderSync::sync_world(BL::Depsgraph &b_depsgraph, BL::SpaceView3D &b_v3d,
         world_color = get_float3(b_world.color());
       }
       else {
-        world_color = make_float3(0.0f, 0.0f, 0.0f);
+        world_color = zero_float3();
       }
 
       BackgroundNode *background = graph->create_node<BackgroundNode>();
@@ -1535,7 +1535,7 @@ void BlenderSync::sync_lights(BL::Depsgraph &b_depsgraph, bool update_all)
       }
       else {
         EmissionNode *emission = graph->create_node<EmissionNode>();
-        emission->set_color(make_float3(1.0f, 1.0f, 1.0f));
+        emission->set_color(one_float3());
         emission->set_strength(1.0f);
         graph->add(emission);
 
diff --git a/intern/cycles/blender/blender_texture.cpp b/intern/cycles/blender/blender_texture.cpp
index 7b05f361a29..0d593f2b385 100644
--- a/intern/cycles/blender/blender_texture.cpp
+++ b/intern/cycles/blender/blender_texture.cpp
@@ -43,8 +43,8 @@ void point_density_texture_space(BL::Depsgraph &b_depsgraph,
 {
   BL::Object b_ob(b_point_density_node.object());
   if (!b_ob) {
-    loc = make_float3(0.0f, 0.0f, 0.0f);
-    size = make_float3(0.0f, 0.0f, 0.0f);
+    loc = zero_float3();
+    size = zero_float3();
     return;
   }
   float3 min, max;