[Bf-blender-cvs] [371abaf66cc] temp-unity-build-test: prepare for unity builds
Jacques Lucke
noreply at git.blender.org
Fri Nov 5 14:48:42 CET 2021
Commit: 371abaf66cc8c59a0727013a8be34721ab96662c
Author: Jacques Lucke
Date: Fri Nov 5 13:11:26 2021 +0100
Branches: temp-unity-build-test
https://developer.blender.org/rB371abaf66cc8c59a0727013a8be34721ab96662c
prepare for unity builds
===================================================================
M source/blender/blenkernel/intern/node.cc
M source/blender/nodes/CMakeLists.txt
M source/blender/nodes/composite/nodes/node_composite_movieclip.cc
M source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc
M source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc
M source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc
M source/blender/nodes/composite/nodes/node_composite_sunbeams.cc
M source/blender/nodes/composite/nodes/node_composite_trackpos.cc
M source/blender/nodes/function/nodes/node_fn_boolean_math.cc
M source/blender/nodes/function/nodes/node_fn_float_compare.cc
M source/blender/nodes/function/nodes/node_fn_float_to_int.cc
M source/blender/nodes/function/nodes/node_fn_rotate_euler.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_clamp.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_color_ramp.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_combine_xyz.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_compare.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_curve_map.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_fill.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_map_range.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_math.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_mix.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_randomize.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_sample_texture.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_separate_xyz.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_math.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_rotate.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_curve_endpoints.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_curve_select_by_handle_type.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_curve_set_handles.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_curve_spline_type.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_curve_to_points.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_delete_geometry.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_edge_split.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_point_distribute.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_point_scale.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_point_separate.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_point_translate.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_reverse.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_set_handles.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc
M source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
M source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc
M source/blender/nodes/geometry/nodes/node_geo_edge_split.cc
M source/blender/nodes/geometry/nodes/node_geo_raycast.cc
M source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc
M source/blender/nodes/geometry/nodes/node_geo_set_curve_radius.cc
M source/blender/nodes/geometry/nodes/node_geo_set_point_radius.cc
M source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc
M source/blender/nodes/shader/nodes/node_shader_hair_info.c
M source/blender/nodes/shader/nodes/node_shader_holdout.c
M source/blender/nodes/shader/nodes/node_shader_map_range.cc
M source/blender/nodes/shader/nodes/node_shader_math.cc
M source/blender/nodes/shader/nodes/node_shader_mixRgb.cc
M source/blender/nodes/shader/nodes/node_shader_particle_info.c
M source/blender/nodes/shader/nodes/node_shader_rgb.c
M source/blender/nodes/shader/nodes/node_shader_script.c
M source/blender/nodes/shader/nodes/node_shader_tex_noise.cc
M source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc
M source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc
M source/blender/nodes/shader/nodes/node_shader_vector_math.cc
M source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc
M source/blender/nodes/texture/node_texture_tree.c
M source/blender/nodes/texture/nodes/node_texture_bricks.c
M source/blender/nodes/texture/nodes/node_texture_image.c
M source/blender/nodes/texture/nodes/node_texture_output.c
M source/blender/nodes/texture/nodes/node_texture_proc.c
===================================================================
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 0827a15dea0..912543e5a88 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -5703,52 +5703,52 @@ static void registerShaderNodes()
static void registerTextureNodes()
{
- register_node_type_tex_group();
-
- register_node_type_tex_math();
- register_node_type_tex_mix_rgb();
- register_node_type_tex_valtorgb();
- register_node_type_tex_rgbtobw();
- register_node_type_tex_valtonor();
- register_node_type_tex_curve_rgb();
- register_node_type_tex_curve_time();
- register_node_type_tex_invert();
- register_node_type_tex_hue_sat();
- register_node_type_tex_coord();
- register_node_type_tex_distance();
- register_node_type_tex_compose();
- register_node_type_tex_decompose();
-
- register_node_type_tex_output();
- register_node_type_tex_viewer();
- register_node_type_sh_script();
- register_node_type_sh_tangent();
- register_node_type_sh_normal_map();
- register_node_type_sh_hair_info();
- register_node_type_sh_volume_info();
-
- register_node_type_tex_checker();
- register_node_type_tex_texture();
- register_node_type_tex_bricks();
- register_node_type_tex_image();
- register_node_type_sh_bsdf_refraction();
- register_node_type_sh_ambient_occlusion();
-
- register_node_type_tex_rotate();
- register_node_type_tex_translate();
- register_node_type_tex_scale();
- register_node_type_tex_at();
-
- register_node_type_tex_proc_voronoi();
- register_node_type_tex_proc_blend();
- register_node_type_tex_proc_magic();
- register_node_type_tex_proc_marble();
- register_node_type_tex_proc_clouds();
- register_node_type_tex_proc_wood();
- register_node_type_tex_proc_musgrave();
- register_node_type_tex_proc_noise();
- register_node_type_tex_proc_stucci();
- register_node_type_tex_proc_distnoise();
+ // register_node_type_tex_group();
+
+ // register_node_type_tex_math();
+ // register_node_type_tex_mix_rgb();
+ // register_node_type_tex_valtorgb();
+ // register_node_type_tex_rgbtobw();
+ // register_node_type_tex_valtonor();
+ // register_node_type_tex_curve_rgb();
+ // register_node_type_tex_curve_time();
+ // register_node_type_tex_invert();
+ // register_node_type_tex_hue_sat();
+ // register_node_type_tex_coord();
+ // register_node_type_tex_distance();
+ // register_node_type_tex_compose();
+ // register_node_type_tex_decompose();
+
+ // register_node_type_tex_output();
+ // register_node_type_tex_viewer();
+ // register_node_type_sh_script();
+ // register_node_type_sh_tangent();
+ // register_node_type_sh_normal_map();
+ // register_node_type_sh_hair_info();
+ // register_node_type_sh_volume_info();
+
+ // register_node_type_tex_checker();
+ // register_node_type_tex_texture();
+ // register_node_type_tex_bricks();
+ // register_node_type_tex_image();
+ // register_node_type_sh_bsdf_refraction();
+ // register_node_type_sh_ambient_occlusion();
+
+ // register_node_type_tex_rotate();
+ // register_node_type_tex_translate();
+ // register_node_type_tex_scale();
+ // register_node_type_tex_at();
+
+ // register_node_type_tex_proc_voronoi();
+ // register_node_type_tex_proc_blend();
+ // register_node_type_tex_proc_magic();
+ // register_node_type_tex_proc_marble();
+ // register_node_type_tex_proc_clouds();
+ // register_node_type_tex_proc_wood();
+ // register_node_type_tex_proc_musgrave();
+ // register_node_type_tex_proc_noise();
+ // register_node_type_tex_proc_stucci();
+ // register_node_type_tex_proc_distnoise();
}
static void registerGeometryNodes()
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index f4ca9f51b1b..19935bebaea 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -389,29 +389,29 @@ set(SRC
shader/node_shader_tree.c
shader/node_shader_util.c
- texture/nodes/node_texture_at.c
- texture/nodes/node_texture_bricks.c
- texture/nodes/node_texture_checker.c
- texture/nodes/node_texture_common.c
- texture/nodes/node_texture_compose.c
- texture/nodes/node_texture_coord.c
- texture/nodes/node_texture_curves.c
- texture/nodes/node_texture_decompose.c
- texture/nodes/node_texture_distance.c
- texture/nodes/node_texture_hueSatVal.c
- texture/nodes/node_texture_image.c
- texture/nodes/node_texture_invert.c
- texture/nodes/node_texture_math.c
- texture/nodes/node_texture_mixRgb.c
- texture/nodes/node_texture_output.c
- texture/nodes/node_texture_proc.c
- texture/nodes/node_texture_rotate.c
- texture/nodes/node_texture_scale.c
- texture/nodes/node_texture_texture.c
- texture/nodes/node_texture_translate.c
- texture/nodes/node_texture_valToNor.c
- texture/nodes/node_texture_valToRgb.c
- texture/nodes/node_texture_viewer.c
+ # texture/nodes/node_texture_at.c
+ # texture/nodes/node_texture_bricks.c
+ # texture/nodes/node_texture_checker.c
+ # texture/nodes/node_texture_common.c
+ # texture/nodes/node_texture_compose.c
+ # texture/nodes/node_texture_coord.c
+ # texture/nodes/node_texture_curves.c
+ # texture/nodes/node_texture_decompose.c
+ # texture/nodes/node_texture_distance.c
+ # texture/nodes/node_texture_hueSatVal.c
+ # texture/nodes/node_texture_image.c
+ # texture/nodes/node_texture_invert.c
+ # texture/nodes/node_texture_math.c
+ # texture/nodes/node_texture_mixRgb.c
+ # texture/nodes/node_texture_output.c
+ # texture/nodes/node_texture_proc.c
+ # texture/nodes/node_texture_rotate.c
+ # texture/nodes/node_texture_scale.c
+ # texture/nodes/node_texture_texture.c
+ # texture/nodes/node_texture_translate.c
+ # texture/nodes/node_texture_valToNor.c
+ # texture/nodes/node_texture_valToRgb.c
+ # texture/nodes/node_texture_viewer.c
texture/node_texture_tree.c
texture/node_texture_util.c
diff --git a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc
index 5d63a1b8002..bf7e9d6d3ec 100644
--- a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc
@@ -40,7 +40,7 @@ static void cmp_node_movieclip_declare(NodeDeclarationBuilder &b)
} // namespace blender::nodes
-static void init(const bContext *C, PointerRNA *ptr)
+static void cmp_node_movieclip_init(const bContext *C, PointerRNA *ptr)
{
bNode *node = (bNode *)ptr->data;
Scene *scene = CTX_data_scene(C);
@@ -59,7 +59,7 @@ void register_node_type_cmp_movieclip(void)
cmp_node_type_base(&ntype, CMP_NODE_MOVIECLIP, "Movie Clip", NODE_CLASS_INPUT, NODE_PREVIEW);
ntype.declare = blender::nodes::cmp_node_movieclip_declare;
- ntype.initfunc_api = init;
+ ntype.initfunc_api = cmp_node_movieclip_init;
node_type_storage(
&ntype, "MovieClipUser", node_free_standard_storage, node_copy_standard_storage);
diff --git a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc
index 2bac30cc152..e4bb19df3d6 100644
--- a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc
@@ -38,7 +38,10 @@ static bNodeSocketTemplate cmp_node_moviedistortion_out[] = {
{-1, ""},
};
-static void label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen)
+static void cmp_node_moviedistortion_label(bNodeTree *UNUSED(ntree),
+ bNode *node,
+ char *label,
+ int maxlen)
{
if (node->custom1 == 0) {
BLI_strncpy(label, IFACE_("Undistortion"), maxlen);
@@ -48,7 +51,7 @@ static void label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen
}
}
-static void init(const bContext *C, PointerRNA *ptr)
+static void cmp_node_moviedistortion_init(const bContext *C, PointerRNA *ptr)
{
bNode *node = (bNode *)ptr->data;
Scene *scene = CTX_data_scene(C);
@@ -57,7 +60,7 @@ static void init(const bContext *C, PointerRNA *ptr)
id_us_plus(node->id);
}
-static void storage_free(bNode *node)
+static void cmp_node_moviedistortion_storage_free(bNode *node)
{
if (node->storage) {
BKE_tracking_distortion_free((MovieDistortion *)node->storage);
@@ -66,7 +69,9 @@ static void storage_free(bNode *node)
node->storage = nullptr;
}
-static void storage_copy(bNodeTree *UNUSED(dest_ntree), bNode *dest_node, const bNode *src_node)
+static void cmp_node_moviedistortion_storage_copy(bNodeTree *UNUSED(dest_ntree),
+ bNode *dest_node,
+ const bNode *src_node)
{
if (src_node->storage) {
dest_node->storage = BKE_tracking_distortion_copy((MovieDistortion *)src_node->storage);
@@ -79,10 +84,13 @@ void register_node_type_cmp_moviedistortion(void)
cmp_node_type_base(&ntype, CMP_NODE_MOVIEDISTORTION, "Movie Distortion", NODE_CLASS_DISTORT, 0);
node_type_socket_templates(&ntype, cmp_node_moviedistortion_in, cmp_node_moviedistortion_out);
- node_type_label(&ntype, label);
+ node_type_label(&ntype, cmp_node_moviedistortion_label);
- ntype.initfunc_api = init;
- node_type_storage(&ntype, nullptr, storage_free, storage_copy);
+ ntype.initfunc_api = cmp_node_moviedistortion_init;
+ node_type_storage(&ntype,
+ nullptr,
+ cmp_node_moviedistortion_storage_free,
+ cmp_node_moviedistortion_storage_copy);
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc
index e122b710b7b..09fd3b8e204 100644
--- a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc
@@ -32,7 +32,7 @@ static bNodeSocketTemplate cmp_node_planetrackdeform_out[] = {
{-1, ""},
};
-static void init(bNodeTree *UNUSED(ntree), bNode *node)
+static void node_cmp_planetrackdeform_init(b
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list