forked from bartvdbraak/blender
Cleanup: clang-format
This commit is contained in:
parent
1198b187b5
commit
f9c0d7261a
@ -299,7 +299,7 @@ class Scene : public NodeOwner {
|
|||||||
* node array (e.g. Scene::geometry for Geometry nodes) and tag the appropriate
|
* node array (e.g. Scene::geometry for Geometry nodes) and tag the appropriate
|
||||||
* manager for an update.
|
* manager for an update.
|
||||||
*/
|
*/
|
||||||
template<typename T, typename... Args> T *create_node(Args &&...args)
|
template<typename T, typename... Args> T *create_node(Args &&... args)
|
||||||
{
|
{
|
||||||
T *node = new T(args...);
|
T *node = new T(args...);
|
||||||
node->set_owner(this);
|
node->set_owner(this);
|
||||||
|
@ -394,9 +394,10 @@ static bool eevee_volume_object_grids_init(Object *ob, ListBase *gpu_grids, DRWS
|
|||||||
* - Grid exists and texture was loaded -> use texture.
|
* - Grid exists and texture was loaded -> use texture.
|
||||||
* - Grid exists but has zero size or failed to load -> use zero.
|
* - Grid exists but has zero size or failed to load -> use zero.
|
||||||
* - Grid does not exist -> use default value. */
|
* - Grid does not exist -> use default value. */
|
||||||
GPUTexture *grid_tex = (drw_grid) ? drw_grid->texture :
|
GPUTexture *grid_tex = (drw_grid) ? drw_grid->texture :
|
||||||
(volume_grid) ? e_data.dummy_zero :
|
(volume_grid) ?
|
||||||
eevee_volume_default_texture(gpu_grid->default_value);
|
e_data.dummy_zero :
|
||||||
|
eevee_volume_default_texture(gpu_grid->default_value);
|
||||||
|
|
||||||
DRW_shgroup_uniform_texture(grp, gpu_grid->sampler_name, grid_tex);
|
DRW_shgroup_uniform_texture(grp, gpu_grid->sampler_name, grid_tex);
|
||||||
|
|
||||||
|
@ -279,9 +279,9 @@ enum {
|
|||||||
/* We cant have both flags enabled at once,
|
/* We cant have both flags enabled at once,
|
||||||
* flags defined in DNA_scene_types.h */
|
* flags defined in DNA_scene_types.h */
|
||||||
#define ME_EDIT_PAINT_SEL_MODE(_me) \
|
#define ME_EDIT_PAINT_SEL_MODE(_me) \
|
||||||
(((_me)->editflag & ME_EDIT_PAINT_FACE_SEL) ? SCE_SELECT_FACE : \
|
(((_me)->editflag & ME_EDIT_PAINT_FACE_SEL) ? \
|
||||||
((_me)->editflag & ME_EDIT_PAINT_VERT_SEL) ? SCE_SELECT_VERTEX : \
|
SCE_SELECT_FACE : \
|
||||||
0)
|
((_me)->editflag & ME_EDIT_PAINT_VERT_SEL) ? SCE_SELECT_VERTEX : 0)
|
||||||
|
|
||||||
/* me->flag */
|
/* me->flag */
|
||||||
enum {
|
enum {
|
||||||
|
@ -90,8 +90,7 @@ static int gpu_shader_map_range(GPUMaterial *mat,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void map_range_signature(
|
static void map_range_signature(blender::fn::MFSignatureBuilder *signature, bool use_steps)
|
||||||
blender::fn::MFSignatureBuilder *signature, bool use_steps)
|
|
||||||
{
|
{
|
||||||
signature->single_input<float>("Value");
|
signature->single_input<float>("Value");
|
||||||
signature->single_input<float>("From Min");
|
signature->single_input<float>("From Min");
|
||||||
|
Loading…
Reference in New Issue
Block a user