[Bf-blender-cvs] [018c9e9da89] xr-dev: Merge branch 'master' into xr-dev

[Peter Kim]

Commit: 018c9e9da89d069a3509c2431da8c62e2b69a409
Author: Peter Kim
Date:   Mon Dec 12 21:33:25 2022 +0900
Branches: xr-dev
https://developer.blender.org/rB018c9e9da89d069a3509c2431da8c62e2b69a409

Merge branch 'master' into xr-dev

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



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

diff --cc source/blender/editors/interface/interface_templates.cc
index aae10de2573,6c71c1bcc65..9cad8226883
--- a/source/blender/editors/interface/interface_templates.cc
+++ b/source/blender/editors/interface/interface_templates.cc
@@@ -6523,44 -6567,6 +6567,44 @@@ void uiTemplateKeymapItemProperties(uiL
  
  /** \} */
  
 +/* -------------------------------------------------------------------- */
 +/** \name XR Actionmap Template
 + * \{ */
 +
 +#ifdef WITH_XR_OPENXR
 +static void xr_actionmap_item_modified(bContext *UNUSED(C),
 +                                       void *UNUSED(ami_p),
 +                                       void *UNUSED(unused))
 +{
 +}
 +#endif
 +
 +void uiTemplateXrActionmapItemProperties(uiLayout *layout, PointerRNA *ptr)
 +{
 +#ifdef WITH_XR_OPENXR
 +  PointerRNA propptr = RNA_pointer_get(ptr, "op_properties");
 +
 +  if (propptr.data) {
-     uiBut *but = uiLayoutGetBlock(layout)->buttons.last;
++    uiBut *but = static_cast<uiBut *>(uiLayoutGetBlock(layout)->buttons.last);
 +
 +    WM_operator_properties_sanitize(&propptr, false);
 +    /* Use same template as keymap item properties. */
-     template_keymap_item_properties(layout, NULL, &propptr);
++    template_keymap_item_properties(layout, nullptr, &propptr);
 +
 +    for (; but; but = but->next) {
 +      if (but->rnaprop) {
-         UI_but_func_set(but, xr_actionmap_item_modified, ptr->data, NULL);
++        UI_but_func_set(but, xr_actionmap_item_modified, ptr->data, nullptr);
 +        UI_but_flag_enable(but, UI_BUT_UPDATE_DELAY);
 +      }
 +    }
 +  }
 +#else
 +  UNUSED_VARS(layout, ptr);
 +#endif
 +}
 +
 +/** \} */
 +
  /* -------------------------------------------------------------------- */
  /** \name Event Icon Template
   * \{ */
diff --cc source/blender/nodes/NOD_shader.h
index 681851eab85,57c1b6c8c5e..e9dbf48b5c4
--- a/source/blender/nodes/NOD_shader.h
+++ b/source/blender/nodes/NOD_shader.h
@@@ -15,122 -15,6 +15,8 @@@ extern "C" 
  
  extern struct bNodeTreeType *ntreeType_Shader;
  
- /* the type definitions array */
- /* ****************** types array for all shaders ****************** */
- 
- void register_node_tree_type_sh(void);
- 
- void register_node_type_sh_group(void);
- 
- void register_node_type_sh_camera(void);
- void register_node_type_sh_value(void);
- void register_node_type_sh_rgb(void);
- void register_node_type_sh_mix_rgb(void);
- void register_node_type_sh_mix(void);
- void register_node_type_sh_valtorgb(void);
- void register_node_type_sh_rgbtobw(void);
- void register_node_type_sh_shadertorgb(void);
- void register_node_type_sh_normal(void);
- void register_node_type_sh_gamma(void);
- void register_node_type_sh_brightcontrast(void);
- void register_node_type_sh_mapping(void);
- void register_node_type_sh_curve_float(void);
- void register_node_type_sh_curve_vec(void);
- void register_node_type_sh_curve_rgb(void);
- void register_node_type_sh_map_range(void);
- void register_node_type_sh_clamp(void);
- void register_node_type_sh_math(void);
- void register_node_type_sh_vect_math(void);
- void register_node_type_sh_squeeze(void);
- void register_node_type_sh_dynamic(void);
- void register_node_type_sh_invert(void);
- void register_node_type_sh_sepcolor(void);
- void register_node_type_sh_combcolor(void);
- void register_node_type_sh_seprgb(void);
- void register_node_type_sh_combrgb(void);
- void register_node_type_sh_sephsv(void);
- void register_node_type_sh_combhsv(void);
- void register_node_type_sh_sepxyz(void);
- void register_node_type_sh_combxyz(void);
- void register_node_type_sh_hue_sat(void);
- void register_node_type_sh_tex_brick(void);
- void register_node_type_sh_tex_pointdensity(void);
- 
- void register_node_type_sh_attribute(void);
- void register_node_type_sh_bevel(void);
- void register_node_type_sh_displacement(void);
- void register_node_type_sh_vector_displacement(void);
- void register_node_type_sh_geometry(void);
- void register_node_type_sh_light_path(void);
- void register_node_type_sh_light_falloff(void);
- void register_node_type_sh_object_info(void);
- void register_node_type_sh_fresnel(void);
- void register_node_type_sh_wireframe(void);
- void register_node_type_sh_wavelength(void);
- void register_node_type_sh_blackbody(void);
- void register_node_type_sh_layer_weight(void);
- void register_node_type_sh_tex_coord(void);
- void register_node_type_sh_particle_info(void);
- void register_node_type_sh_hair_info(void);
- void register_node_type_sh_point_info(void);
- void register_node_type_sh_volume_info(void);
- void register_node_type_sh_script(void);
- void register_node_type_sh_normal_map(void);
- void register_node_type_sh_tangent(void);
- void register_node_type_sh_vector_rotate(void);
- void register_node_type_sh_vect_transform(void);
- void register_node_type_sh_vertex_color(void);
- 
- void register_node_type_sh_ambient_occlusion(void);
- void register_node_type_sh_background(void);
- void register_node_type_sh_bsdf_diffuse(void);
- void register_node_type_sh_bsdf_glossy(void);
- void register_node_type_sh_bsdf_glass(void);
- void register_node_type_sh_bsdf_refraction(void);
- void register_node_type_sh_bsdf_translucent(void);
- void register_node_type_sh_bsdf_transparent(void);
- void register_node_type_sh_bsdf_velvet(void);
- void register_node_type_sh_bsdf_toon(void);
- void register_node_type_sh_bsdf_anisotropic(void);
- void register_node_type_sh_bsdf_principled(void);
- void register_node_type_sh_emission(void);
- void register_node_type_sh_holdout(void);
- void register_node_type_sh_volume_absorption(void);
- void register_node_type_sh_volume_scatter(void);
- void register_node_type_sh_volume_principled(void);
- void register_node_type_sh_bsdf_hair(void);
- void register_node_type_sh_bsdf_hair_principled(void);
- void register_node_type_sh_subsurface_scattering(void);
- void register_node_type_sh_mix_shader(void);
- void register_node_type_sh_add_shader(void);
- void register_node_type_sh_uvmap(void);
- void register_node_type_sh_uvalongstroke(void);
- void register_node_type_sh_eevee_metallic(void);
- void register_node_type_sh_eevee_specular(void);
- 
- void register_node_type_sh_output_light(void);
- void register_node_type_sh_output_material(void);
- void register_node_type_sh_output_eevee_material(void);
- void register_node_type_sh_output_world(void);
- void register_node_type_sh_output_linestyle(void);
- void register_node_type_sh_output_aov(void);
- 
- void register_node_type_sh_tex_image(void);
- void register_node_type_sh_tex_environment(void);
- void register_node_type_sh_tex_sky(void);
- void register_node_type_sh_tex_voronoi(void);
- void register_node_type_sh_tex_gradient(void);
- void register_node_type_sh_tex_magic(void);
- void register_node_type_sh_tex_wave(void);
- void register_node_type_sh_tex_musgrave(void);
- void register_node_type_sh_tex_noise(void);
- void register_node_type_sh_tex_checker(void);
- void register_node_type_sh_bump(void);
- void register_node_type_sh_tex_ies(void);
- void register_node_type_sh_tex_white_noise(void);
- 
 +void register_node_type_sh_virtual_camera(void);
 +
  void register_node_type_sh_custom_group(bNodeType *ntype);
  
  struct bNodeTreeExec *ntreeShaderBeginExecTree(struct bNodeTree *ntree);
diff --cc source/blender/nodes/shader/node_shader_register.cc
index 00000000000,e18639f9520..5817ecb8411
mode 000000,100644..100644
--- a/source/blender/nodes/shader/node_shader_register.cc
+++ b/source/blender/nodes/shader/node_shader_register.cc
@@@ -1,0 -1,112 +1,113 @@@
+ /* SPDX-License-Identifier: GPL-2.0-or-later */
+ 
+ #include "NOD_register.hh"
+ 
+ #include "node_shader_register.hh"
+ 
+ void register_shader_nodes()
+ {
+   register_node_tree_type_sh();
+ 
+   register_node_type_sh_group();
+ 
+   register_node_type_sh_add_shader();
+   register_node_type_sh_ambient_occlusion();
+   register_node_type_sh_attribute();
+   register_node_type_sh_background();
+   register_node_type_sh_bevel();
+   register_node_type_sh_blackbody();
+   register_node_type_sh_brightcontrast();
+   register_node_type_sh_bsdf_anisotropic();
+   register_node_type_sh_bsdf_diffuse();
+   register_node_type_sh_bsdf_glass();
+   register_node_type_sh_bsdf_glossy();
+   register_node_type_sh_bsdf_hair_principled();
+   register_node_type_sh_bsdf_hair();
+   register_node_type_sh_bsdf_principled();
+   register_node_type_sh_bsdf_refraction();
+   register_node_type_sh_bsdf_toon();
+   register_node_type_sh_bsdf_translucent();
+   register_node_type_sh_bsdf_transparent();
+   register_node_type_sh_bsdf_velvet();
+   register_node_type_sh_bump();
+   register_node_type_sh_camera();
+   register_node_type_sh_clamp();
+   register_node_type_sh_combcolor();
+   register_node_type_sh_combhsv();
+   register_node_type_sh_combrgb();
+   register_node_type_sh_combxyz();
+   register_node_type_sh_curve_float();
+   register_node_type_sh_curve_rgb();
+   register_node_type_sh_curve_vec();
+   register_node_type_sh_displacement();
+   register_node_type_sh_eevee_specular();
+   register_node_type_sh_emission();
+   register_node_type_sh_fresnel();
+   register_node_type_sh_gamma();
+   register_node_type_sh_geometry();
+   register_node_type_sh_hair_info();
+   register_node_type_sh_holdout();
+   register_node_type_sh_hue_sat();
+   register_node_type_sh_invert();
+   register_node_type_sh_layer_weight();
+   register_node_type_sh_light_falloff();
+   register_node_type_sh_light_path();
+   register_node_type_sh_map_range();
+   register_node_type_sh_mapping();
+   register_node_type_sh_math();
+   register_node_type_sh_mix_rgb();
+   register_node_type_sh_mix_shader();
+   register_node_type_sh_mix();
+   register_node_type_sh_normal_map();
+   register_node_type_sh_normal();
+   register_node_type_sh_object_info();
+   register_node_type_sh_output_aov();
+   register_node_type_sh_output_light();
+   register_node_type_sh_output_linestyle();
+   register_node_type_sh_output_material();
+   register_node_type_sh_output_world();
+   register_node_type_sh_particle_info();
+   register_node_type_sh_point_info();
+   register_node_type_sh_rgb();
+   register_node_type_sh_rgbtobw();
+   register_node_type_sh_script();
+   register_node_type_sh_sepcolor();
+   register_node

@@ Diff output truncated at 10240 characters. @@