forked from blender/blender
WIP: uv-simple-select #1
@ -520,7 +520,6 @@ void CustomData_bmesh_free_block_data_exclude_by_type(struct CustomData *data,
|
||||
void *block,
|
||||
eCustomDataMask mask_exclude);
|
||||
|
||||
|
||||
/**
|
||||
* Query info over types.
|
||||
*/
|
||||
|
@ -92,4 +92,3 @@ TEST(nla_track, BKE_nlatrack_remove_strip)
|
||||
}
|
||||
|
||||
} // namespace blender::bke::tests
|
||||
|
||||
|
@ -21,8 +21,7 @@ void main()
|
||||
float light_count = 0.0;
|
||||
uint light_cull = 0u;
|
||||
vec2 px = gl_FragCoord.xy;
|
||||
LIGHT_FOREACH_BEGIN_LOCAL(light_cull_buf, light_zbin_buf, light_tile_buf, px, vP_z, l_idx)
|
||||
{
|
||||
LIGHT_FOREACH_BEGIN_LOCAL (light_cull_buf, light_zbin_buf, light_tile_buf, px, vP_z, l_idx) {
|
||||
LightData light = light_buf[l_idx];
|
||||
light_cull |= 1u << l_idx;
|
||||
light_count += 1.0;
|
||||
|
@ -192,4 +192,4 @@ void main()
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -38,4 +38,4 @@ void main()
|
||||
}
|
||||
tile_start += lod_len;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -126,4 +126,4 @@ void main()
|
||||
clear_dispatch_buf.num_groups_x = pages_infos_buf.page_size / SHADOW_PAGE_CLEAR_GROUP_SIZE;
|
||||
clear_dispatch_buf.num_groups_y = pages_infos_buf.page_size / SHADOW_PAGE_CLEAR_GROUP_SIZE;
|
||||
clear_dispatch_buf.num_groups_z = 0;
|
||||
}
|
||||
}
|
||||
|
@ -51,4 +51,4 @@ void main()
|
||||
}
|
||||
tile_start += lod_len;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -52,4 +52,4 @@ void main()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -91,4 +91,4 @@ void main()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -29,4 +29,4 @@ void main()
|
||||
vec2 pixel = vec2(gl_GlobalInvocationID.xy);
|
||||
|
||||
shadow_tag_usage(vP, P, pixel);
|
||||
}
|
||||
}
|
||||
|
@ -12,4 +12,4 @@
|
||||
void main()
|
||||
{
|
||||
shadow_tag_usage(interp.vP, interp.P, gl_FragCoord.xy);
|
||||
}
|
||||
}
|
||||
|
@ -101,4 +101,4 @@ void shadow_tag_usage(vec3 vP, vec3 P, vec2 pixel)
|
||||
shadow_tag_usage_tilemap(l_idx, P, dist_to_cam, false);
|
||||
}
|
||||
LIGHT_FOREACH_END
|
||||
}
|
||||
}
|
||||
|
@ -19,4 +19,4 @@ void main()
|
||||
interp.vP = point_world_to_view(interp.P);
|
||||
|
||||
gl_Position = point_world_to_ndc(interp.P);
|
||||
}
|
||||
}
|
||||
|
@ -395,4 +395,4 @@ void main()
|
||||
EXPECT_NEAR(shadow_slope_bias_get(atlas_size, light, lNg, lP0, vec2(0.0), 2), 0.0, 1e-4);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -74,4 +74,4 @@ void main()
|
||||
* thread 0. */
|
||||
}
|
||||
LIGHT_FOREACH_END
|
||||
}
|
||||
}
|
||||
|
@ -178,4 +178,4 @@ void main()
|
||||
/* Clamp it as it can underflow if there is too much tile present on screen. */
|
||||
pages_infos_buf.page_free_count = max(pages_infos_buf.page_free_count, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -90,4 +90,4 @@ void main()
|
||||
tiles_buf[tile_store] = tile;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -698,7 +698,7 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob)
|
||||
drw_call_calc_orco(ob, ob_infos->orcotexfac);
|
||||
/* Random float value. */
|
||||
uint random = (DST.dupli_source) ?
|
||||
DST.dupli_source->random_id :
|
||||
DST.dupli_source->random_id :
|
||||
/* TODO(fclem): this is rather costly to do at runtime. Maybe we can
|
||||
* put it in ob->runtime and make depsgraph ensure it is up to date. */
|
||||
BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
|
||||
|
@ -4059,12 +4059,11 @@ void GPENCIL_OT_reproject(wmOperatorType *ot)
|
||||
ot->prop = RNA_def_enum(
|
||||
ot->srna, "type", reproject_type, GP_REPROJECT_VIEW, "Projection Type", "");
|
||||
|
||||
prop = RNA_def_boolean(
|
||||
ot->srna,
|
||||
"keep_original",
|
||||
0,
|
||||
"Keep Original",
|
||||
"Keep original strokes and create a copy before reprojecting");
|
||||
prop = RNA_def_boolean(ot->srna,
|
||||
"keep_original",
|
||||
0,
|
||||
"Keep Original",
|
||||
"Keep original strokes and create a copy before reprojecting");
|
||||
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_MOVIECLIP);
|
||||
|
||||
RNA_def_float(ot->srna, "offset", 0.0f, 0.0f, 10.0f, "Surface Offset", "", 0.0f, 10.0f);
|
||||
|
@ -55,7 +55,8 @@ constexpr VkAllocationCallbacks vk_allocation_callbacks_init(const char *name)
|
||||
# define VK_ALLOCATION_CALLBACKS \
|
||||
static constexpr const VkAllocationCallbacks vk_allocation_callbacks_ = \
|
||||
vk_allocation_callbacks_init(__func__); \
|
||||
static constexpr const VkAllocationCallbacks *vk_allocation_callbacks = &vk_allocation_callbacks_;
|
||||
static constexpr const VkAllocationCallbacks *vk_allocation_callbacks = \
|
||||
&vk_allocation_callbacks_;
|
||||
#else
|
||||
# define VK_ALLOCATION_CALLBACKS \
|
||||
static constexpr const VkAllocationCallbacks *vk_allocation_callbacks = nullptr;
|
||||
|
@ -16,10 +16,10 @@
|
||||
#include <pxr/pxr.h>
|
||||
#include <pxr/usd/usd/primRange.h>
|
||||
#include <pxr/usd/usdGeom/camera.h>
|
||||
#include <pxr/usd/usdGeom/curves.h>
|
||||
#include <pxr/usd/usdGeom/capsule.h>
|
||||
#include <pxr/usd/usdGeom/cone.h>
|
||||
#include <pxr/usd/usdGeom/cube.h>
|
||||
#include <pxr/usd/usdGeom/curves.h>
|
||||
#include <pxr/usd/usdGeom/cylinder.h>
|
||||
#include <pxr/usd/usdGeom/mesh.h>
|
||||
#include <pxr/usd/usdGeom/nurbsCurves.h>
|
||||
@ -66,7 +66,7 @@ bool USDStageReader::valid() const
|
||||
bool USDStageReader::is_primitive_prim(const pxr::UsdPrim &prim) const
|
||||
{
|
||||
return (prim.IsA<pxr::UsdGeomCapsule>() || prim.IsA<pxr::UsdGeomCylinder>() ||
|
||||
prim.IsA<pxr::UsdGeomCone>() || prim.IsA<pxr::UsdGeomCube>() ||
|
||||
prim.IsA<pxr::UsdGeomCone>() || prim.IsA<pxr::UsdGeomCube>() ||
|
||||
prim.IsA<pxr::UsdGeomSphere>());
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user