Chris_Blackbourn/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

WIP: uv-simple-select #1

Closed
Chris Blackbourn wants to merge 182 commits from uv-simple-select into main
pull from: uv-simple-select
merge into: Chris_Blackbourn:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 182 Files Changed 881 +25 -28
21 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 78f3157ae7 - Show all commits

1
source/blender/blenkernel/BKE_customdata.h
View File

@ -520,7 +520,6 @@ void CustomData_bmesh_free_block_data_exclude_by_type(struct CustomData *data,
void *block, void *block,
eCustomDataMask mask_exclude); eCustomDataMask mask_exclude);
/** /**
* Query info over types. * Query info over types.
*/ */

1
source/blender/blenkernel/intern/nla_test.cc
View File

@ -92,4 +92,3 @@ TEST(nla_track, BKE_nlatrack_remove_strip)
} }
} // namespace blender::bke::tests } // namespace blender::bke::tests

3
source/blender/draw/engines/eevee_next/shaders/eevee_light_culling_debug_frag.glsl
View File

@ -21,8 +21,7 @@ void main()
float light_count = 0.0; float light_count = 0.0;
uint light_cull = 0u; uint light_cull = 0u;
vec2 px = gl_FragCoord.xy; 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]; LightData light = light_buf[l_idx];
light_cull |= 1u << l_idx; light_cull |= 1u << l_idx;
light_count += 1.0; light_count += 1.0;

2
source/blender/draw/intern/draw_manager_data.cc
View File

@ -698,7 +698,7 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob)
drw_call_calc_orco(ob, ob_infos->orcotexfac); drw_call_calc_orco(ob, ob_infos->orcotexfac);
/* Random float value. */ /* Random float value. */
uint random = (DST.dupli_source) ? 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 /* 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. */ * 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); BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);

11
source/blender/editors/gpencil/gpencil_edit.c
View File

@ -4059,12 +4059,11 @@ void GPENCIL_OT_reproject(wmOperatorType *ot)
ot->prop = RNA_def_enum( ot->prop = RNA_def_enum(
ot->srna, "type", reproject_type, GP_REPROJECT_VIEW, "Projection Type", ""); ot->srna, "type", reproject_type, GP_REPROJECT_VIEW, "Projection Type", "");
prop = RNA_def_boolean( prop = RNA_def_boolean(ot->srna,
ot->srna, "keep_original",
"keep_original", 0,
0, "Keep Original",
"Keep Original", "Keep original strokes and create a copy before reprojecting");
"Keep original strokes and create a copy before reprojecting");
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_MOVIECLIP); 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); RNA_def_float(ot->srna, "offset", 0.0f, 0.0f, 10.0f, "Surface Offset", "", 0.0f, 10.0f);

3
source/blender/gpu/vulkan/vk_memory.hh
View File

@ -55,7 +55,8 @@ constexpr VkAllocationCallbacks vk_allocation_callbacks_init(const char *name)
# define VK_ALLOCATION_CALLBACKS \ # define VK_ALLOCATION_CALLBACKS \
static constexpr const VkAllocationCallbacks vk_allocation_callbacks_ = \ static constexpr const VkAllocationCallbacks vk_allocation_callbacks_ = \
vk_allocation_callbacks_init(__func__); \ 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 #else
# define VK_ALLOCATION_CALLBACKS \ # define VK_ALLOCATION_CALLBACKS \
static constexpr const VkAllocationCallbacks *vk_allocation_callbacks = nullptr; static constexpr const VkAllocationCallbacks *vk_allocation_callbacks = nullptr;

4
source/blender/io/usd/intern/usd_reader_stage.cc
View File

@ -16,10 +16,10 @@
#include <pxr/pxr.h> #include <pxr/pxr.h>
#include <pxr/usd/usd/primRange.h> #include <pxr/usd/usd/primRange.h>
#include <pxr/usd/usdGeom/camera.h> #include <pxr/usd/usdGeom/camera.h>
#include <pxr/usd/usdGeom/curves.h>
#include <pxr/usd/usdGeom/capsule.h> #include <pxr/usd/usdGeom/capsule.h>
#include <pxr/usd/usdGeom/cone.h> #include <pxr/usd/usdGeom/cone.h>
#include <pxr/usd/usdGeom/cube.h> #include <pxr/usd/usdGeom/cube.h>
#include <pxr/usd/usdGeom/curves.h>
#include <pxr/usd/usdGeom/cylinder.h> #include <pxr/usd/usdGeom/cylinder.h>
#include <pxr/usd/usdGeom/mesh.h> #include <pxr/usd/usdGeom/mesh.h>
#include <pxr/usd/usdGeom/nurbsCurves.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 bool USDStageReader::is_primitive_prim(const pxr::UsdPrim &prim) const
{ {
return (prim.IsA<pxr::UsdGeomCapsule>() || prim.IsA<pxr::UsdGeomCylinder>() || 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>()); prim.IsA<pxr::UsdGeomSphere>());
} }