UI: Fix Typos in Comments and Docs
Approximately 91 spelling corrections, almost all in comments. Differential Revision: https://developer.blender.org/D10288 Reviewed by Harley Acheson
This commit is contained in:
parent
3560f5c1e6
commit
a4a9d14ba7
@ -160,7 +160,7 @@ struct REGISTRY_ENTRY {
|
|||||||
PCWSTR pszValueName;
|
PCWSTR pszValueName;
|
||||||
DWORD dwValueType;
|
DWORD dwValueType;
|
||||||
PCWSTR pszData; // These two fields could/should have been a union, but C++
|
PCWSTR pszData; // These two fields could/should have been a union, but C++
|
||||||
DWORD dwData; // only lets you initalize the first field in a union.
|
DWORD dwData; // only lets you initialize the first field in a union.
|
||||||
};
|
};
|
||||||
|
|
||||||
// Creates a registry key (if needed) and sets the default value of the key
|
// Creates a registry key (if needed) and sets the default value of the key
|
||||||
|
@ -128,7 +128,7 @@ class WriteAttribute {
|
|||||||
void *array_buffer_ = nullptr;
|
void *array_buffer_ = nullptr;
|
||||||
/* True, when the buffer points to a temporary array. */
|
/* True, when the buffer points to a temporary array. */
|
||||||
bool array_is_temporary_ = false;
|
bool array_is_temporary_ = false;
|
||||||
/* This helps to protect agains forgetting to apply changes done to the array. */
|
/* This helps to protect against forgetting to apply changes done to the array. */
|
||||||
bool array_should_be_applied_ = false;
|
bool array_should_be_applied_ = false;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -77,7 +77,7 @@ enum {
|
|||||||
IDWALK_CB_USER = (1 << 8),
|
IDWALK_CB_USER = (1 << 8),
|
||||||
/**
|
/**
|
||||||
* This ID usage is not refcounted, but at least one user should be generated by it (to avoid
|
* This ID usage is not refcounted, but at least one user should be generated by it (to avoid
|
||||||
* e.g. loosing the used ID on save/reload).
|
* e.g. losing the used ID on save/reload).
|
||||||
* Callback is responsible to deal accordingly with #ID.us if needed.
|
* Callback is responsible to deal accordingly with #ID.us if needed.
|
||||||
*/
|
*/
|
||||||
IDWALK_CB_USER_ONE = (1 << 9),
|
IDWALK_CB_USER_ONE = (1 << 9),
|
||||||
|
@ -293,7 +293,7 @@ bool BKE_subdiv_ccg_check_coord_valid(const SubdivCCG *subdiv_ccg, const SubdivC
|
|||||||
* neighbor elements in total).
|
* neighbor elements in total).
|
||||||
*
|
*
|
||||||
* - For the corner element a single neighboring element on every adjacent edge, single from
|
* - For the corner element a single neighboring element on every adjacent edge, single from
|
||||||
* every gird.
|
* every grid.
|
||||||
*
|
*
|
||||||
* - For the boundary element two neighbor elements on the boundary (from same grid) and one
|
* - For the boundary element two neighbor elements on the boundary (from same grid) and one
|
||||||
* element inside of every neighboring grid. */
|
* element inside of every neighboring grid. */
|
||||||
|
@ -1594,7 +1594,7 @@ static bool nla_combine_get_inverted_strip_value(const int mix_mode,
|
|||||||
if (IS_EQF(base_value, 0.0f)) {
|
if (IS_EQF(base_value, 0.0f)) {
|
||||||
base_value = 1.0f;
|
base_value = 1.0f;
|
||||||
}
|
}
|
||||||
/* Divison by zero. */
|
/* Division by zero. */
|
||||||
if (IS_EQF(lower_value, 0.0f)) {
|
if (IS_EQF(lower_value, 0.0f)) {
|
||||||
/* Resolve 0/0 to 1. */
|
/* Resolve 0/0 to 1. */
|
||||||
if (IS_EQF(blended_value, 0.0f)) {
|
if (IS_EQF(blended_value, 0.0f)) {
|
||||||
|
@ -375,7 +375,7 @@ static int brush_undo_preserve_cb(LibraryIDLinkCallbackData *cb_data)
|
|||||||
|
|
||||||
static void brush_undo_preserve(BlendLibReader *reader, ID *id_new, ID *id_old)
|
static void brush_undo_preserve(BlendLibReader *reader, ID *id_new, ID *id_old)
|
||||||
{
|
{
|
||||||
/* Whole Brush is preserved accross undo's. */
|
/* Whole Brush is preserved across undos. */
|
||||||
BKE_lib_id_swap(NULL, id_new, id_old);
|
BKE_lib_id_swap(NULL, id_new, id_old);
|
||||||
|
|
||||||
/* `id_new` now has content from `id_old`, we need to ensure those old ID pointers are valid.
|
/* `id_new` now has content from `id_old`, we need to ensure those old ID pointers are valid.
|
||||||
|
@ -4693,7 +4693,7 @@ static void pivotcon_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *ta
|
|||||||
copy_m3_m4(rotMat, cob->matrix);
|
copy_m3_m4(rotMat, cob->matrix);
|
||||||
normalize_m3(rotMat);
|
normalize_m3(rotMat);
|
||||||
|
|
||||||
/* correct the pivot by the rotation axis otherwise the pivot translates when it shouldnt */
|
/* correct the pivot by the rotation axis otherwise the pivot translates when it shouldn't */
|
||||||
mat3_normalized_to_axis_angle(axis, &angle, rotMat);
|
mat3_normalized_to_axis_angle(axis, &angle, rotMat);
|
||||||
if (angle) {
|
if (angle) {
|
||||||
float dvec[3];
|
float dvec[3];
|
||||||
|
@ -1110,7 +1110,7 @@ void fcurve_samples_to_keyframes(FCurve *fcu, const int start, const int end)
|
|||||||
|
|
||||||
if (fcu->fpt == NULL) {
|
if (fcu->fpt == NULL) {
|
||||||
/* No data to unbake. */
|
/* No data to unbake. */
|
||||||
CLOG_ERROR(&LOG, "Error: Curve containts no baked keyframes");
|
CLOG_ERROR(&LOG, "Error: Curve contains no baked keyframes");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -665,7 +665,7 @@ static float (*mask_spline_feather_differentiated_points_with_resolution__double
|
|||||||
|
|
||||||
len_feather = len_v2v2(bezt_prev->vec[1], bezt_curr->vec[1]);
|
len_feather = len_v2v2(bezt_prev->vec[1], bezt_curr->vec[1]);
|
||||||
|
|
||||||
/* scale by chane in length */
|
/* scale by change in length */
|
||||||
len_scalar = len_feather / len_base;
|
len_scalar = len_feather / len_base;
|
||||||
dist_ensure_v2_v2fl(bezt_prev->vec[2],
|
dist_ensure_v2_v2fl(bezt_prev->vec[2],
|
||||||
bezt_prev->vec[1],
|
bezt_prev->vec[1],
|
||||||
|
@ -1219,7 +1219,7 @@ int test_index_face(MFace *mface, CustomData *fdata, int mfindex, int nr)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Check corrupt cases, bow-tie geometry,
|
/* Check corrupt cases, bow-tie geometry,
|
||||||
* cant handle these because edge data wont exist so just return 0. */
|
* can't handle these because edge data won't exist so just return 0. */
|
||||||
if (nr == 3) {
|
if (nr == 3) {
|
||||||
if (
|
if (
|
||||||
/* real edges */
|
/* real edges */
|
||||||
|
@ -475,7 +475,7 @@ static void prefair_and_fair_vertices(FairingContext *fairing_context,
|
|||||||
|
|
||||||
/* Fair. */
|
/* Fair. */
|
||||||
VoronoiVertexWeight *voronoi_vertex_weights = new VoronoiVertexWeight(fairing_context);
|
VoronoiVertexWeight *voronoi_vertex_weights = new VoronoiVertexWeight(fairing_context);
|
||||||
/* TODO: Implemente cotangent loop weights. */
|
/* TODO: Implement cotangent loop weights. */
|
||||||
fairing_context->fair_vertices(
|
fairing_context->fair_vertices(
|
||||||
affected_vertices, depth, voronoi_vertex_weights, uniform_loop_weights);
|
affected_vertices, depth, voronoi_vertex_weights, uniform_loop_weights);
|
||||||
|
|
||||||
|
@ -263,6 +263,6 @@ void BKE_mesh_calc_edges(Mesh *mesh, bool keep_existing_edges, const bool select
|
|||||||
mesh->totedge = new_totedge;
|
mesh->totedge = new_totedge;
|
||||||
mesh->medge = new_edges.data();
|
mesh->medge = new_edges.data();
|
||||||
|
|
||||||
/* Explicitely clear edge maps, because that way it can be parallelized. */
|
/* Explicitly clear edge maps, because that way it can be parallelized. */
|
||||||
clear_hash_tables(edge_maps);
|
clear_hash_tables(edge_maps);
|
||||||
}
|
}
|
||||||
|
@ -127,7 +127,7 @@ static void palette_blend_read_data(BlendDataReader *reader, ID *id)
|
|||||||
|
|
||||||
static void palette_undo_preserve(BlendLibReader *UNUSED(reader), ID *id_new, ID *id_old)
|
static void palette_undo_preserve(BlendLibReader *UNUSED(reader), ID *id_new, ID *id_old)
|
||||||
{
|
{
|
||||||
/* Whole Palette is preserved accross undo's, and it has no extra pointer, simple. */
|
/* Whole Palette is preserved across undos, and it has no extra pointer, simple. */
|
||||||
/* Note: We do not care about potential internal references to self here, Palette has none. */
|
/* Note: We do not care about potential internal references to self here, Palette has none. */
|
||||||
/* Note: We do not swap IDProperties, as dealing with potential ID pointers in those would be
|
/* Note: We do not swap IDProperties, as dealing with potential ID pointers in those would be
|
||||||
* fairly delicate. */
|
* fairly delicate. */
|
||||||
|
@ -2304,7 +2304,7 @@ void psys_particle_on_emitter(ParticleSystemModifierData *psmd,
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
/* we cant use the num_dmcache */
|
/* we can't use the num_dmcache */
|
||||||
psys_particle_on_dm(
|
psys_particle_on_dm(
|
||||||
psmd->mesh_final, from, index, index_dmcache, fuv, foffset, vec, nor, utan, vtan, orco);
|
psmd->mesh_final, from, index, index_dmcache, fuv, foffset, vec, nor, utan, vtan, orco);
|
||||||
}
|
}
|
||||||
|
@ -138,7 +138,7 @@ TEST_F(TrackingTest, BKE_tracking_marker_get_interpolated)
|
|||||||
BKE_tracking_track_free(&track);
|
BKE_tracking_track_free(&track);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* More comprehensive test, which resembles real life trackign scenario better. */
|
/* More comprehensive test, which resembles real-life tracking scenario better. */
|
||||||
{
|
{
|
||||||
MovieTrackingTrack track = {nullptr};
|
MovieTrackingTrack track = {nullptr};
|
||||||
|
|
||||||
|
@ -145,7 +145,7 @@ static struct VolumeFileCache {
|
|||||||
|
|
||||||
/* Has the grid tree been loaded? */
|
/* Has the grid tree been loaded? */
|
||||||
bool is_loaded;
|
bool is_loaded;
|
||||||
/* Error message if an error occured during loading. */
|
/* Error message if an error occurred while loading. */
|
||||||
std::string error_msg;
|
std::string error_msg;
|
||||||
/* User counting. */
|
/* User counting. */
|
||||||
int num_metadata_users;
|
int num_metadata_users;
|
||||||
|
@ -1312,7 +1312,7 @@ BVHTreeOverlap *BLI_bvhtree_overlap_ex(
|
|||||||
bool use_threading = (flag & BVH_OVERLAP_USE_THREADING) != 0 &&
|
bool use_threading = (flag & BVH_OVERLAP_USE_THREADING) != 0 &&
|
||||||
(tree1->totleaf > KDOPBVH_THREAD_LEAF_THRESHOLD);
|
(tree1->totleaf > KDOPBVH_THREAD_LEAF_THRESHOLD);
|
||||||
|
|
||||||
/* `RETURN_PAIRS` was not implemented without `max_interations`. */
|
/* 'RETURN_PAIRS' was not implemented without 'max_interactions'. */
|
||||||
BLI_assert(overlap_pairs || max_interactions);
|
BLI_assert(overlap_pairs || max_interactions);
|
||||||
|
|
||||||
const int root_node_len = BLI_bvhtree_overlap_thread_num(tree1);
|
const int root_node_len = BLI_bvhtree_overlap_thread_num(tree1);
|
||||||
|
@ -1375,7 +1375,7 @@ void BLI_make_file_string(const char *relabase, char *string, const char *dir, c
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return; /* string is NULL, probably shouldnt happen but return anyway */
|
return; /* string is NULL, probably shouldn't happen but return anyway */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Resolve relative references */
|
/* Resolve relative references */
|
||||||
|
@ -731,7 +731,7 @@ static BMOpDefine bmo_edgenet_fill_def = {
|
|||||||
*
|
*
|
||||||
* - One single loop; an edge is added to connect the ends
|
* - One single loop; an edge is added to connect the ends
|
||||||
* - Two loops; two edges are added to connect the endpoints (based on the
|
* - Two loops; two edges are added to connect the endpoints (based on the
|
||||||
* shortest distance between each endpont).
|
* shortest distance between each endpoint).
|
||||||
*/
|
*/
|
||||||
static BMOpDefine bmo_edgenet_prepare_def = {
|
static BMOpDefine bmo_edgenet_prepare_def = {
|
||||||
"edgenet_prepare",
|
"edgenet_prepare",
|
||||||
|
@ -53,7 +53,7 @@ if(NOT WITH_HEADLESS)
|
|||||||
|
|
||||||
include_directories(${PNG_INCLUDE_DIRS})
|
include_directories(${PNG_INCLUDE_DIRS})
|
||||||
if(NOT APPLE)
|
if(NOT APPLE)
|
||||||
# APPLE plaform uses full paths for linking libraries.
|
# APPLE platform uses full paths for linking libraries.
|
||||||
link_directories(${PNG_LIBPATH} ${ZLIB_LIBPATH})
|
link_directories(${PNG_LIBPATH} ${ZLIB_LIBPATH})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -2496,7 +2496,7 @@ void DepsgraphRelationBuilder::build_material(Material *material)
|
|||||||
/* Animated / driven parameters (without nodetree). */
|
/* Animated / driven parameters (without nodetree). */
|
||||||
OperationKey material_key(&material->id, NodeType::SHADING, OperationCode::MATERIAL_UPDATE);
|
OperationKey material_key(&material->id, NodeType::SHADING, OperationCode::MATERIAL_UPDATE);
|
||||||
ComponentKey parameters_key(&material->id, NodeType::PARAMETERS);
|
ComponentKey parameters_key(&material->id, NodeType::PARAMETERS);
|
||||||
add_relation(parameters_key, material_key, "Material's paramters");
|
add_relation(parameters_key, material_key, "Material's parameters");
|
||||||
|
|
||||||
/* material's nodetree */
|
/* material's nodetree */
|
||||||
if (material->nodetree != nullptr) {
|
if (material->nodetree != nullptr) {
|
||||||
|
@ -46,7 +46,7 @@ class SceneBackup {
|
|||||||
*
|
*
|
||||||
* NOTE: Scene can not disappear after relations update, because otherwise the entire dependency
|
* NOTE: Scene can not disappear after relations update, because otherwise the entire dependency
|
||||||
* graph will be gone. This means we don't need to compare original scene pointer, or worry about
|
* graph will be gone. This means we don't need to compare original scene pointer, or worry about
|
||||||
* freeing those if they cant' be restored: we just copy them over to a new scene. */
|
* freeing those if they can't be restored: we just copy them over to a new scene. */
|
||||||
void *sound_scene;
|
void *sound_scene;
|
||||||
void *playback_handle;
|
void *playback_handle;
|
||||||
void *sound_scrub_handle;
|
void *sound_scrub_handle;
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
* EEVEE LUT generation:
|
* EEVEE LUT generation:
|
||||||
*
|
*
|
||||||
* Routine to generate the LUT used by eevee stored in eevee_lut.h
|
* Routine to generate the LUT used by eevee stored in eevee_lut.h
|
||||||
* Theses functions are not to be used in the final executable.
|
* These functions are not to be used in the final executable.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "DRW_render.h"
|
#include "DRW_render.h"
|
||||||
|
@ -415,7 +415,7 @@ void EEVEE_materials_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
|
|||||||
{
|
{
|
||||||
/* Renderpass accumulation. */
|
/* Renderpass accumulation. */
|
||||||
DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | DRW_STATE_BLEND_ADD_FULL;
|
DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | DRW_STATE_BLEND_ADD_FULL;
|
||||||
/* Create an instance of each of theses passes and link them together. */
|
/* Create an instance of each of these passes and link them together. */
|
||||||
DRWPass *passes[] = {
|
DRWPass *passes[] = {
|
||||||
psl->material_ps,
|
psl->material_ps,
|
||||||
psl->material_cull_ps,
|
psl->material_cull_ps,
|
||||||
|
@ -476,7 +476,7 @@ void EEVEE_motion_blur_cache_finish(EEVEE_Data *vedata)
|
|||||||
if (vbo) {
|
if (vbo) {
|
||||||
/* Use the vbo to perform the copy on the GPU. */
|
/* Use the vbo to perform the copy on the GPU. */
|
||||||
GPU_vertbuf_use(vbo);
|
GPU_vertbuf_use(vbo);
|
||||||
/* Perform a copy to avoid loosing it after RE_engine_frame_set(). */
|
/* Perform a copy to avoid losing it after RE_engine_frame_set(). */
|
||||||
mb_geom->vbo[mb_step] = vbo = GPU_vertbuf_duplicate(vbo);
|
mb_geom->vbo[mb_step] = vbo = GPU_vertbuf_duplicate(vbo);
|
||||||
/* Find and replace "pos" attrib name. */
|
/* Find and replace "pos" attrib name. */
|
||||||
GPUVertFormat *format = (GPUVertFormat *)GPU_vertbuf_get_format(vbo);
|
GPUVertFormat *format = (GPUVertFormat *)GPU_vertbuf_get_format(vbo);
|
||||||
|
@ -716,7 +716,7 @@ typedef struct EEVEE_EffectsInfo {
|
|||||||
CameraParams past_cam_params;
|
CameraParams past_cam_params;
|
||||||
CameraParams current_cam_params;
|
CameraParams current_cam_params;
|
||||||
char motion_blur_step; /* Which step we are evaluating. */
|
char motion_blur_step; /* Which step we are evaluating. */
|
||||||
int motion_blur_max; /* Maximum distance in pixels a motion blured pixel can cover. */
|
int motion_blur_max; /* Maximum distance in pixels a motion-blurred pixel can cover. */
|
||||||
float motion_blur_near_far[2]; /* Camera near/far clip distances (positive). */
|
float motion_blur_near_far[2]; /* Camera near/far clip distances (positive). */
|
||||||
bool cam_params_init;
|
bool cam_params_init;
|
||||||
/* TODO(fclem): Only used in render mode for now.
|
/* TODO(fclem): Only used in render mode for now.
|
||||||
|
@ -258,7 +258,7 @@ static void eevee_shader_library_ensure(void)
|
|||||||
{
|
{
|
||||||
if (e_data.lib == NULL) {
|
if (e_data.lib == NULL) {
|
||||||
e_data.lib = DRW_shader_library_create();
|
e_data.lib = DRW_shader_library_create();
|
||||||
/* NOTE: Theses needs to be ordered by dependencies. */
|
/* NOTE: These need to be ordered by dependencies. */
|
||||||
DRW_SHADER_LIB_ADD(e_data.lib, common_math_lib);
|
DRW_SHADER_LIB_ADD(e_data.lib, common_math_lib);
|
||||||
DRW_SHADER_LIB_ADD(e_data.lib, common_math_geom_lib);
|
DRW_SHADER_LIB_ADD(e_data.lib, common_math_geom_lib);
|
||||||
DRW_SHADER_LIB_ADD(e_data.lib, common_hair_lib);
|
DRW_SHADER_LIB_ADD(e_data.lib, common_hair_lib);
|
||||||
|
@ -60,7 +60,7 @@ vec2 sample_weights(float center_depth,
|
|||||||
float sample_motion_length,
|
float sample_motion_length,
|
||||||
float offset_length)
|
float offset_length)
|
||||||
{
|
{
|
||||||
/* Clasify foreground/background. */
|
/* Classify foreground/background. */
|
||||||
vec2 depth_weight = depth_compare(center_depth, sample_depth);
|
vec2 depth_weight = depth_compare(center_depth, sample_depth);
|
||||||
/* Weight if sample is overlapping or under the center pixel. */
|
/* Weight if sample is overlapping or under the center pixel. */
|
||||||
vec2 spread_weight = spread_compare(center_motion_length, sample_motion_length, offset_length);
|
vec2 spread_weight = spread_compare(center_motion_length, sample_motion_length, offset_length);
|
||||||
|
@ -238,7 +238,7 @@ vec3 raycast(int index,
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Discard backface hits. Only do this if the ray traveled enough to avoid loosing intricate
|
/* Discard backface hits. Only do this if the ray traveled enough to avoid losing intricate
|
||||||
* contact reflections. This is only used for SSReflections. */
|
* contact reflections. This is only used for SSReflections. */
|
||||||
if (discard_backface && prev_delta < 0.0 && curr_time > 4.1) {
|
if (discard_backface && prev_delta < 0.0 && curr_time > 4.1) {
|
||||||
hit = false;
|
hit = false;
|
||||||
|
@ -393,7 +393,7 @@ void stroke_vertex()
|
|||||||
is_squares = false;
|
is_squares = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Enpoints, we discard the vertices. */
|
/* Endpoints, we discard the vertices. */
|
||||||
if (ma1.x == -1 || (!is_dot && ma2.x == -1)) {
|
if (ma1.x == -1 || (!is_dot && ma2.x == -1)) {
|
||||||
discard_vert();
|
discard_vert();
|
||||||
return;
|
return;
|
||||||
|
@ -274,7 +274,7 @@ uniform bool isFirstPass;
|
|||||||
vec2 compute_uvs(float x)
|
vec2 compute_uvs(float x)
|
||||||
{
|
{
|
||||||
vec2 uv = uvcoordsvar.xy;
|
vec2 uv = uvcoordsvar.xy;
|
||||||
/* Tranform UV (loc, rot, scale) */
|
/* Transform UV (loc, rot, scale) */
|
||||||
uv = uv.x * uvRotX + uv.y * uvRotY + uvOffset;
|
uv = uv.x * uvRotX + uv.y * uvRotY + uvOffset;
|
||||||
uv += blurDir * x;
|
uv += blurDir * x;
|
||||||
/* Wave deform. */
|
/* Wave deform. */
|
||||||
|
@ -49,7 +49,7 @@ void IMAGE_shader_library_ensure(void)
|
|||||||
{
|
{
|
||||||
if (e_data.lib == NULL) {
|
if (e_data.lib == NULL) {
|
||||||
e_data.lib = DRW_shader_library_create();
|
e_data.lib = DRW_shader_library_create();
|
||||||
/* NOTE: Theses needs to be ordered by dependencies. */
|
/* NOTE: These need to be ordered by dependencies. */
|
||||||
DRW_SHADER_LIB_ADD(e_data.lib, common_colormanagement_lib);
|
DRW_SHADER_LIB_ADD(e_data.lib, common_colormanagement_lib);
|
||||||
DRW_SHADER_LIB_ADD(e_data.lib, common_globals_lib);
|
DRW_SHADER_LIB_ADD(e_data.lib, common_globals_lib);
|
||||||
DRW_SHADER_LIB_ADD(e_data.lib, common_view_lib);
|
DRW_SHADER_LIB_ADD(e_data.lib, common_view_lib);
|
||||||
|
@ -1176,7 +1176,7 @@ void OVERLAY_camera_cache_populate(OVERLAY_Data *vedata, Object *ob)
|
|||||||
invert_v3(scale);
|
invert_v3(scale);
|
||||||
for (int i = 0; i < 4; i++) {
|
for (int i = 0; i < 4; i++) {
|
||||||
mul_v3_v3(vec[i], scale);
|
mul_v3_v3(vec[i], scale);
|
||||||
/* Project to z=-1 plane. Makes positionning / scaling easier. (see shader) */
|
/* Project to z=-1 plane. Makes positioning / scaling easier. (see shader) */
|
||||||
mul_v2_fl(vec[i], 1.0f / fabsf(vec[i][2]));
|
mul_v2_fl(vec[i], 1.0f / fabsf(vec[i][2]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -238,7 +238,7 @@ void OVERLAY_shader_library_ensure(void)
|
|||||||
{
|
{
|
||||||
if (e_data.lib == NULL) {
|
if (e_data.lib == NULL) {
|
||||||
e_data.lib = DRW_shader_library_create();
|
e_data.lib = DRW_shader_library_create();
|
||||||
/* NOTE: Theses needs to be ordered by dependencies. */
|
/* NOTE: These need to be ordered by dependencies. */
|
||||||
DRW_SHADER_LIB_ADD(e_data.lib, common_globals_lib);
|
DRW_SHADER_LIB_ADD(e_data.lib, common_globals_lib);
|
||||||
DRW_SHADER_LIB_ADD(e_data.lib, common_overlay_lib);
|
DRW_SHADER_LIB_ADD(e_data.lib, common_overlay_lib);
|
||||||
DRW_SHADER_LIB_ADD(e_data.lib, common_colormanagement_lib);
|
DRW_SHADER_LIB_ADD(e_data.lib, common_colormanagement_lib);
|
||||||
|
@ -146,7 +146,7 @@ void main()
|
|||||||
vec4 lines = vec4(neightbor_line0.z, neightbor_line1.z, neightbor_line2.z, neightbor_line3.z);
|
vec4 lines = vec4(neightbor_line0.z, neightbor_line1.z, neightbor_line2.z, neightbor_line3.z);
|
||||||
/* Count number of line neighbors. */
|
/* Count number of line neighbors. */
|
||||||
float blend = dot(vec4(0.25), step(0.001, lines));
|
float blend = dot(vec4(0.25), step(0.001, lines));
|
||||||
/* Only do blend if there is more than 2 neighbor. This avoid loosing too much AA. */
|
/* Only do blend if there are more than 2 neighbors. This avoids losing too much AA. */
|
||||||
blend = clamp(blend * 2.0 - 1.0, 0.0, 1.0);
|
blend = clamp(blend * 2.0 - 1.0, 0.0, 1.0);
|
||||||
fragColor = mix(fragColor, fragColor / fragColor.a, blend);
|
fragColor = mix(fragColor, fragColor / fragColor.a, blend);
|
||||||
}
|
}
|
||||||
|
@ -222,7 +222,7 @@ void main()
|
|||||||
edgePos = edgeStart = ((gl_Position.xy / gl_Position.w) * 0.5 + 0.5) * sizeViewport.xy;
|
edgePos = edgeStart = ((gl_Position.xy / gl_Position.w) * 0.5 + 0.5) * sizeViewport.xy;
|
||||||
|
|
||||||
#ifdef SELECT_EDGES
|
#ifdef SELECT_EDGES
|
||||||
/* HACK: to avoid loosing sub pixel object in selections, we add a bit of randomness to the
|
/* HACK: to avoid losing sub-pixel object in selections, we add a bit of randomness to the
|
||||||
* wire to at least create one fragment that will pass the occlusion query. */
|
* wire to at least create one fragment that will pass the occlusion query. */
|
||||||
/* TODO(fclem): Limit this workaround to selection. It's not very noticeable but still... */
|
/* TODO(fclem): Limit this workaround to selection. It's not very noticeable but still... */
|
||||||
gl_Position.xy += sizeViewportInv.xy * gl_Position.w * ((gl_VertexID % 2 == 0) ? -1.0 : 1.0);
|
gl_Position.xy += sizeViewportInv.xy * gl_Position.w * ((gl_VertexID % 2 == 0) ? -1.0 : 1.0);
|
||||||
|
@ -18,7 +18,7 @@ void main()
|
|||||||
gl_Position = point_world_to_ndc(world_pos);
|
gl_Position = point_world_to_ndc(world_pos);
|
||||||
|
|
||||||
#ifdef SELECT_EDGES
|
#ifdef SELECT_EDGES
|
||||||
/* HACK: to avoid loosing sub pixel object in selections, we add a bit of randomness to the
|
/* HACK: to avoid losing sub-pixel object in selections, we add a bit of randomness to the
|
||||||
* wire to at least create one fragment that will pass the occlusion query. */
|
* wire to at least create one fragment that will pass the occlusion query. */
|
||||||
/* TODO(fclem): Limit this workaround to selection. It's not very noticeable but still... */
|
/* TODO(fclem): Limit this workaround to selection. It's not very noticeable but still... */
|
||||||
gl_Position.xy += sizeViewportInv.xy * gl_Position.w * ((gl_VertexID % 2 == 0) ? -1.0 : 1.0);
|
gl_Position.xy += sizeViewportInv.xy * gl_Position.w * ((gl_VertexID % 2 == 0) ? -1.0 : 1.0);
|
||||||
|
@ -169,7 +169,7 @@ void main()
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef SELECT_EDGES
|
#ifdef SELECT_EDGES
|
||||||
/* HACK: to avoid loosing sub pixel object in selections, we add a bit of randomness to the
|
/* HACK: to avoid losing sub-pixel object in selections, we add a bit of randomness to the
|
||||||
* wire to at least create one fragment that will pass the occlusion query. */
|
* wire to at least create one fragment that will pass the occlusion query. */
|
||||||
gl_Position.xy += sizeViewportInv.xy * gl_Position.w * ((gl_VertexID % 2 == 0) ? -1.0 : 1.0);
|
gl_Position.xy += sizeViewportInv.xy * gl_Position.w * ((gl_VertexID % 2 == 0) ? -1.0 : 1.0);
|
||||||
#endif
|
#endif
|
||||||
|
@ -120,7 +120,7 @@ void workbench_shader_library_ensure(void)
|
|||||||
{
|
{
|
||||||
if (e_data.lib == NULL) {
|
if (e_data.lib == NULL) {
|
||||||
e_data.lib = DRW_shader_library_create();
|
e_data.lib = DRW_shader_library_create();
|
||||||
/* NOTE: Theses needs to be ordered by dependencies. */
|
/* NOTE: These need to be ordered by dependencies. */
|
||||||
DRW_SHADER_LIB_ADD(e_data.lib, common_math_lib);
|
DRW_SHADER_LIB_ADD(e_data.lib, common_math_lib);
|
||||||
DRW_SHADER_LIB_ADD(e_data.lib, common_math_geom_lib);
|
DRW_SHADER_LIB_ADD(e_data.lib, common_math_geom_lib);
|
||||||
DRW_SHADER_LIB_ADD(e_data.lib, common_hair_lib);
|
DRW_SHADER_LIB_ADD(e_data.lib, common_hair_lib);
|
||||||
|
@ -907,7 +907,7 @@ static void extract_tris_finish(const MeshRenderData *mr,
|
|||||||
if (mr->use_final_mesh && cache->final.tris_per_mat) {
|
if (mr->use_final_mesh && cache->final.tris_per_mat) {
|
||||||
MeshBufferCache *mbc = &cache->final;
|
MeshBufferCache *mbc = &cache->final;
|
||||||
for (int i = 0; i < mr->mat_len; i++) {
|
for (int i = 0; i < mr->mat_len; i++) {
|
||||||
/* Theses IBOs have not been queried yet but we create them just in case they are needed
|
/* These IBOs have not been queried yet but we create them just in case they are needed
|
||||||
* later since they are not tracked by mesh_buffer_cache_create_requested(). */
|
* later since they are not tracked by mesh_buffer_cache_create_requested(). */
|
||||||
if (mbc->tris_per_mat[i] == NULL) {
|
if (mbc->tris_per_mat[i] == NULL) {
|
||||||
mbc->tris_per_mat[i] = GPU_indexbuf_calloc();
|
mbc->tris_per_mat[i] = GPU_indexbuf_calloc();
|
||||||
@ -1380,7 +1380,7 @@ static void extract_lines_paint_mask_iter_poly_mesh(const MeshRenderData *mr,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
/* Set theses unselected loop only if this edge has no other selected loop. */
|
/* Set these unselected loop only if this edge has no other selected loop. */
|
||||||
if (!BLI_BITMAP_TEST(data->select_map, e_index)) {
|
if (!BLI_BITMAP_TEST(data->select_map, e_index)) {
|
||||||
GPU_indexbuf_set_line_verts(&data->elb, e_index, ml_index, ml_index_other);
|
GPU_indexbuf_set_line_verts(&data->elb, e_index, ml_index, ml_index_other);
|
||||||
}
|
}
|
||||||
@ -5230,7 +5230,7 @@ static void *extract_skin_roots_init(const MeshRenderData *mr,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* It's really unlikely that all verts will be roots. Resize to avoid loosing VRAM. */
|
/* It's really unlikely that all verts will be roots. Resize to avoid losing VRAM. */
|
||||||
GPU_vertbuf_data_len_set(vbo, root_len);
|
GPU_vertbuf_data_len_set(vbo, root_len);
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -118,7 +118,7 @@
|
|||||||
* half-rate linear filtering on GCN.
|
* half-rate linear filtering on GCN.
|
||||||
*
|
*
|
||||||
* If SMAA is applied to 64-bit color buffers, switching to point filtering
|
* If SMAA is applied to 64-bit color buffers, switching to point filtering
|
||||||
* when accesing them will increase the performance. Search for
|
* when accessing them will increase the performance. Search for
|
||||||
* 'SMAASamplePoint' to see which textures may benefit from point
|
* 'SMAASamplePoint' to see which textures may benefit from point
|
||||||
* filtering, and where (which is basically the color input in the edge
|
* filtering, and where (which is basically the color input in the edge
|
||||||
* detection and resolve passes).
|
* detection and resolve passes).
|
||||||
|
@ -331,7 +331,7 @@ static void motionpath_calculate_update_range(MPathTarget *mpt,
|
|||||||
int fcu_sfra = motionpath_get_prev_prev_keyframe(mpt, &fcu_keys, current_frame);
|
int fcu_sfra = motionpath_get_prev_prev_keyframe(mpt, &fcu_keys, current_frame);
|
||||||
int fcu_efra = motionpath_get_next_next_keyframe(mpt, &fcu_keys, current_frame);
|
int fcu_efra = motionpath_get_next_next_keyframe(mpt, &fcu_keys, current_frame);
|
||||||
|
|
||||||
/* Extend range fuhrer, since acceleration compensation propagates even further away. */
|
/* Extend range further, since acceleration compensation propagates even further away. */
|
||||||
if (fcu->auto_smoothing != FCURVE_SMOOTH_NONE) {
|
if (fcu->auto_smoothing != FCURVE_SMOOTH_NONE) {
|
||||||
fcu_sfra = motionpath_get_prev_prev_keyframe(mpt, &fcu_keys, fcu_sfra);
|
fcu_sfra = motionpath_get_prev_prev_keyframe(mpt, &fcu_keys, fcu_sfra);
|
||||||
fcu_efra = motionpath_get_next_next_keyframe(mpt, &fcu_keys, fcu_efra);
|
fcu_efra = motionpath_get_next_next_keyframe(mpt, &fcu_keys, fcu_efra);
|
||||||
|
@ -497,7 +497,7 @@ static float heat_source_distance(LaplacianSystem *sys, int vertex, int source)
|
|||||||
{
|
{
|
||||||
float closest[3], d[3], dist, cosine;
|
float closest[3], d[3], dist, cosine;
|
||||||
|
|
||||||
/* compute euclidian distance */
|
/* compute Euclidean distance */
|
||||||
closest_to_line_segment_v3(
|
closest_to_line_segment_v3(
|
||||||
closest, sys->heat.verts[vertex], sys->heat.root[source], sys->heat.tip[source]);
|
closest, sys->heat.verts[vertex], sys->heat.root[source], sys->heat.tip[source]);
|
||||||
|
|
||||||
|
@ -2419,7 +2419,7 @@ static void adduplicateflagNurb(
|
|||||||
memcpy(newnu->bp, &nu->bp[a], newu * newv * sizeof(BPoint));
|
memcpy(newnu->bp, &nu->bp[a], newu * newv * sizeof(BPoint));
|
||||||
memcpy(&newnu->bp[newu * newv], nu->bp, newu * cyclicv * sizeof(BPoint));
|
memcpy(&newnu->bp[newu * newv], nu->bp, newu * cyclicv * sizeof(BPoint));
|
||||||
|
|
||||||
/* check for actvert in cylicv selection */
|
/* check for actvert in cyclicv selection */
|
||||||
if (cu->actnu == i) {
|
if (cu->actnu == i) {
|
||||||
calc_duplicate_actvert(
|
calc_duplicate_actvert(
|
||||||
editnurb, newnurb, cu, cu->actvert, a, (newu * newv) + cu->actvert);
|
editnurb, newnurb, cu, cu->actvert, a, (newu * newv) + cu->actvert);
|
||||||
@ -6102,7 +6102,7 @@ static bool curve_delete_segments(Object *obedit, View3D *v3d, const bool split)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!split && cut != -1 && nu->pntsu > 2 && !(nu->flagu & CU_NURB_CYCLIC)) {
|
if (!split && cut != -1 && nu->pntsu > 2 && !(nu->flagu & CU_NURB_CYCLIC)) {
|
||||||
/* start and points copied if connecting segment was deleted and not cylic spline */
|
/* start and points copied if connecting segment was deleted and not cyclic spline */
|
||||||
bezt1 = nu->bezt;
|
bezt1 = nu->bezt;
|
||||||
bezt2 = &nu->bezt[1];
|
bezt2 = &nu->bezt[1];
|
||||||
|
|
||||||
@ -6232,7 +6232,7 @@ static bool curve_delete_segments(Object *obedit, View3D *v3d, const bool split)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!split && cut != -1 && nu->pntsu > 2 && !(nu->flagu & CU_NURB_CYCLIC)) {
|
if (!split && cut != -1 && nu->pntsu > 2 && !(nu->flagu & CU_NURB_CYCLIC)) {
|
||||||
/* start and points copied if connecting segment was deleted and not cylic spline */
|
/* start and points copied if connecting segment was deleted and not cyclic spline */
|
||||||
bp1 = nu->bp;
|
bp1 = nu->bp;
|
||||||
bp2 = &nu->bp[1];
|
bp2 = &nu->bp[1];
|
||||||
|
|
||||||
@ -6352,7 +6352,7 @@ static bool curve_delete_segments(Object *obedit, View3D *v3d, const bool split)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!split && cut != -1 && nu->pntsv > 2 && !(nu->flagv & CU_NURB_CYCLIC)) {
|
if (!split && cut != -1 && nu->pntsv > 2 && !(nu->flagv & CU_NURB_CYCLIC)) {
|
||||||
/* start and points copied if connecting segment was deleted and not cylic spline */
|
/* start and points copied if connecting segment was deleted and not cyclic spline */
|
||||||
bp1 = nu->bp;
|
bp1 = nu->bp;
|
||||||
bp2 = &nu->bp[nu->pntsu];
|
bp2 = &nu->bp[nu->pntsu];
|
||||||
|
|
||||||
|
@ -151,7 +151,7 @@ typedef struct tGP_BrushVertexpaintData {
|
|||||||
tGP_Grid *grid;
|
tGP_Grid *grid;
|
||||||
/** Total number of rows/cols. */
|
/** Total number of rows/cols. */
|
||||||
int grid_size;
|
int grid_size;
|
||||||
/** Total number of cells elments in the grid array. */
|
/** Total number of cells elements in the grid array. */
|
||||||
int grid_len;
|
int grid_len;
|
||||||
/** Grid sample position (used to determine distance of falloff) */
|
/** Grid sample position (used to determine distance of falloff) */
|
||||||
int grid_sample[2];
|
int grid_sample[2];
|
||||||
|
@ -194,7 +194,7 @@ typedef enum FSMenuInsert {
|
|||||||
FS_INSERT_SAVE = (1 << 1),
|
FS_INSERT_SAVE = (1 << 1),
|
||||||
/** moves the item to the front of the list when its not already there */
|
/** moves the item to the front of the list when its not already there */
|
||||||
FS_INSERT_FIRST = (1 << 2),
|
FS_INSERT_FIRST = (1 << 2),
|
||||||
/** just append to preseve delivered order */
|
/** just append to preserve delivered order */
|
||||||
FS_INSERT_LAST = (1 << 3),
|
FS_INSERT_LAST = (1 << 3),
|
||||||
} FSMenuInsert;
|
} FSMenuInsert;
|
||||||
|
|
||||||
|
@ -118,7 +118,7 @@ typedef struct KeyframeEdit_CircleData {
|
|||||||
} KeyframeEdit_CircleData;
|
} KeyframeEdit_CircleData;
|
||||||
|
|
||||||
/* ************************************************ */
|
/* ************************************************ */
|
||||||
/* Non-Destuctive Editing API (keyframes_edit.c) */
|
/* Non-Destructive Editing API (keyframes_edit.c) */
|
||||||
|
|
||||||
/* --- Defines for 'OK' polls + KeyframeEditData Flags --------- */
|
/* --- Defines for 'OK' polls + KeyframeEditData Flags --------- */
|
||||||
|
|
||||||
|
@ -6837,7 +6837,7 @@ static bool ui_numedit_but_CURVE(uiBlock *block,
|
|||||||
|
|
||||||
#ifdef USE_CONT_MOUSE_CORRECT
|
#ifdef USE_CONT_MOUSE_CORRECT
|
||||||
/* note: using 'cmp_last' is weak since there may be multiple points selected,
|
/* note: using 'cmp_last' is weak since there may be multiple points selected,
|
||||||
* but in practice this isnt really an issue */
|
* but in practice this isn't really an issue */
|
||||||
if (ui_but_is_cursor_warp(but)) {
|
if (ui_but_is_cursor_warp(but)) {
|
||||||
/* OK but can go outside bounds */
|
/* OK but can go outside bounds */
|
||||||
data->ungrab_mval[0] = but->rect.xmin + ((cmp_last->x - cumap->curr.xmin) * zoomx);
|
data->ungrab_mval[0] = but->rect.xmin + ((cmp_last->x - cumap->curr.xmin) * zoomx);
|
||||||
@ -7108,7 +7108,7 @@ static bool ui_numedit_but_CURVEPROFILE(uiBlock *block,
|
|||||||
changed = true;
|
changed = true;
|
||||||
#ifdef USE_CONT_MOUSE_CORRECT
|
#ifdef USE_CONT_MOUSE_CORRECT
|
||||||
/* note: using 'cmp_last' is weak since there may be multiple points selected,
|
/* note: using 'cmp_last' is weak since there may be multiple points selected,
|
||||||
* but in practice this isnt really an issue */
|
* but in practice this isn't really an issue */
|
||||||
if (ui_but_is_cursor_warp(but)) {
|
if (ui_but_is_cursor_warp(but)) {
|
||||||
/* OK but can go outside bounds */
|
/* OK but can go outside bounds */
|
||||||
data->ungrab_mval[0] = but->rect.xmin + ((last_x - profile->view_rect.xmin) * zoomx);
|
data->ungrab_mval[0] = but->rect.xmin + ((last_x - profile->view_rect.xmin) * zoomx);
|
||||||
@ -8617,7 +8617,7 @@ void ui_but_activate_event(bContext *C, ARegion *region, uiBut *but)
|
|||||||
* Simulate moving the mouse over a button (or navigating to it with arrow keys).
|
* Simulate moving the mouse over a button (or navigating to it with arrow keys).
|
||||||
*
|
*
|
||||||
* exported so menus can start with a highlighted button,
|
* exported so menus can start with a highlighted button,
|
||||||
* even if the mouse isnt over it
|
* even if the mouse isn't over it
|
||||||
*/
|
*/
|
||||||
void ui_but_activate_over(bContext *C, ARegion *region, uiBut *but)
|
void ui_but_activate_over(bContext *C, ARegion *region, uiBut *but)
|
||||||
{
|
{
|
||||||
|
@ -2341,7 +2341,7 @@ void OBJECT_OT_make_local(wmOperatorType *ot)
|
|||||||
|
|
||||||
static bool make_override_library_object_overridable_check(Main *bmain, Object *object)
|
static bool make_override_library_object_overridable_check(Main *bmain, Object *object)
|
||||||
{
|
{
|
||||||
/* An object is actually overrideable only if it is in at least one local collections.
|
/* An object is actually overridable only if it is in at least one local collection.
|
||||||
* Unfortunately 'direct link' flag is not enough here. */
|
* Unfortunately 'direct link' flag is not enough here. */
|
||||||
LISTBASE_FOREACH (Collection *, collection, &bmain->collections) {
|
LISTBASE_FOREACH (Collection *, collection, &bmain->collections) {
|
||||||
if (!ID_IS_LINKED(collection) && BKE_collection_has_object(collection, object)) {
|
if (!ID_IS_LINKED(collection) && BKE_collection_has_object(collection, object)) {
|
||||||
|
@ -363,7 +363,7 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
/* shouldnt suddenly give errors mid-render but possible */
|
/* shouldn't suddenly give errors mid-render but possible */
|
||||||
char err_out[256] = "unknown";
|
char err_out[256] = "unknown";
|
||||||
ImBuf *ibuf_view;
|
ImBuf *ibuf_view;
|
||||||
const int alpha_mode = (draw_sky) ? R_ADDSKY : R_ALPHAPREMUL;
|
const int alpha_mode = (draw_sky) ? R_ADDSKY : R_ALPHAPREMUL;
|
||||||
|
@ -554,7 +554,7 @@ static void draw_background(FileLayout *layout, View2D *v2d)
|
|||||||
for (i = 2; (i <= layout->rows + 1); i += 2) {
|
for (i = 2; (i <= layout->rows + 1); i += 2) {
|
||||||
sy = (int)v2d->cur.ymax - layout->offset_top - i * item_height - layout->tile_border_y;
|
sy = (int)v2d->cur.ymax - layout->offset_top - i * item_height - layout->tile_border_y;
|
||||||
|
|
||||||
/* Offsett pattern slightly to add scroll effect. */
|
/* Offset pattern slightly to add scroll effect. */
|
||||||
sy += round_fl_to_int(item_height * (v2d->tot.ymax - v2d->cur.ymax) / item_height);
|
sy += round_fl_to_int(item_height * (v2d->tot.ymax - v2d->cur.ymax) / item_height);
|
||||||
|
|
||||||
immRectf(pos,
|
immRectf(pos,
|
||||||
|
@ -393,7 +393,7 @@ static void view3d_main_region_init(wmWindowManager *wm, ARegion *region)
|
|||||||
keymap = WM_keymap_ensure(wm->defaultconf, "Paint Vertex Selection (Weight, Vertex)", 0, 0);
|
keymap = WM_keymap_ensure(wm->defaultconf, "Paint Vertex Selection (Weight, Vertex)", 0, 0);
|
||||||
WM_event_add_keymap_handler(®ion->handlers, keymap);
|
WM_event_add_keymap_handler(®ion->handlers, keymap);
|
||||||
|
|
||||||
/* Before 'Weight/Vertex Paint' so adding curve points is not overriden. */
|
/* Before 'Weight/Vertex Paint' so adding curve points is not overridden. */
|
||||||
keymap = WM_keymap_ensure(wm->defaultconf, "Paint Curve", 0, 0);
|
keymap = WM_keymap_ensure(wm->defaultconf, "Paint Curve", 0, 0);
|
||||||
WM_event_add_keymap_handler(®ion->handlers, keymap);
|
WM_event_add_keymap_handler(®ion->handlers, keymap);
|
||||||
|
|
||||||
|
@ -845,7 +845,7 @@ void special_aftertrans_update__sequencer(bContext *UNUSED(C), TransInfo *t)
|
|||||||
/* Marker transform, not especially nice but we may want to move markers
|
/* Marker transform, not especially nice but we may want to move markers
|
||||||
* at the same time as strips in the Video Sequencer. */
|
* at the same time as strips in the Video Sequencer. */
|
||||||
if (sseq->flag & SEQ_MARKER_TRANS) {
|
if (sseq->flag & SEQ_MARKER_TRANS) {
|
||||||
/* cant use TFM_TIME_EXTEND
|
/* can't use TFM_TIME_EXTEND
|
||||||
* for some reason EXTEND is changed into TRANSLATE, so use frame_side instead */
|
* for some reason EXTEND is changed into TRANSLATE, so use frame_side instead */
|
||||||
|
|
||||||
if (t->mode == TFM_SEQ_SLIDE) {
|
if (t->mode == TFM_SEQ_SLIDE) {
|
||||||
|
@ -260,8 +260,8 @@ PyDoc_STRVAR(Operators_sequential_split_doc,
|
|||||||
"\n"
|
"\n"
|
||||||
" .. tip::\n"
|
" .. tip::\n"
|
||||||
"\n"
|
"\n"
|
||||||
" By specifiying a starting and stopping predicate allows\n"
|
" By specifying a starting and stopping predicate allows\n"
|
||||||
" the chains to overlapp rather than chains partitioning.\n"
|
" the chains to overlap rather than chains partitioning.\n"
|
||||||
"\n"
|
"\n"
|
||||||
" :arg starting_pred: The predicate on a point that expresses the\n"
|
" :arg starting_pred: The predicate on a point that expresses the\n"
|
||||||
" starting condition. Each time this condition is verified, a new chain begins\n"
|
" starting condition. Each time this condition is verified, a new chain begins\n"
|
||||||
|
@ -228,7 +228,7 @@ class ViewMap {
|
|||||||
*/
|
*/
|
||||||
ViewVertex *InsertViewVertex(SVertex *iVertex, vector<ViewEdge *> &newViewEdges);
|
ViewVertex *InsertViewVertex(SVertex *iVertex, vector<ViewEdge *> &newViewEdges);
|
||||||
|
|
||||||
/* connects a FEdge to the graph trough a SVertex */
|
/* connects a FEdge to the graph through a SVertex */
|
||||||
// FEdge *Connect(FEdge *ioEdge, SVertex *ioVertex);
|
// FEdge *Connect(FEdge *ioEdge, SVertex *ioVertex);
|
||||||
|
|
||||||
/* Clean temporary FEdges created by chaining */
|
/* Clean temporary FEdges created by chaining */
|
||||||
@ -1085,13 +1085,13 @@ class ViewEdge : public Interface1D {
|
|||||||
return __B;
|
return __B;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*! Returns the first FEdge that constitues this ViewEdge. */
|
/*! Returns the first FEdge that constitutes this ViewEdge. */
|
||||||
inline FEdge *fedgeA()
|
inline FEdge *fedgeA()
|
||||||
{
|
{
|
||||||
return _FEdgeA;
|
return _FEdgeA;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*! Returns the last FEdge that constitues this ViewEdge. */
|
/*! Returns the last FEdge that constitutes this ViewEdge. */
|
||||||
inline FEdge *fedgeB()
|
inline FEdge *fedgeB()
|
||||||
{
|
{
|
||||||
return _FEdgeB;
|
return _FEdgeB;
|
||||||
|
@ -128,7 +128,7 @@ void GPU_batch_program_set_builtin_with_config(GPUBatch *batch,
|
|||||||
eGPUShaderConfig sh_cfg);
|
eGPUShaderConfig sh_cfg);
|
||||||
|
|
||||||
/* Will only work after setting the batch program. */
|
/* Will only work after setting the batch program. */
|
||||||
/* TODO(fclem): Theses needs to be replaced by GPU_shader_uniform_* with explicit shader. */
|
/* TODO(fclem): These need to be replaced by GPU_shader_uniform_* with explicit shader. */
|
||||||
#define GPU_batch_uniform_1i(batch, name, x) GPU_shader_uniform_1i((batch)->shader, name, x);
|
#define GPU_batch_uniform_1i(batch, name, x) GPU_shader_uniform_1i((batch)->shader, name, x);
|
||||||
#define GPU_batch_uniform_1b(batch, name, x) GPU_shader_uniform_1b((batch)->shader, name, x);
|
#define GPU_batch_uniform_1b(batch, name, x) GPU_shader_uniform_1b((batch)->shader, name, x);
|
||||||
#define GPU_batch_uniform_1f(batch, name, x) GPU_shader_uniform_1f((batch)->shader, name, x);
|
#define GPU_batch_uniform_1f(batch, name, x) GPU_shader_uniform_1f((batch)->shader, name, x);
|
||||||
|
@ -308,7 +308,7 @@ static void detect_workarounds()
|
|||||||
if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_WIN, GPU_DRIVER_OFFICIAL) && !GLEW_VERSION_4_5) {
|
if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_WIN, GPU_DRIVER_OFFICIAL) && !GLEW_VERSION_4_5) {
|
||||||
GLContext::copy_image_support = false;
|
GLContext::copy_image_support = false;
|
||||||
}
|
}
|
||||||
/* Special fix for theses specific GPUs.
|
/* Special fix for these specific GPUs.
|
||||||
* Without this workaround, blender crashes on startup. (see T72098) */
|
* Without this workaround, blender crashes on startup. (see T72098) */
|
||||||
if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_WIN, GPU_DRIVER_OFFICIAL) &&
|
if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_WIN, GPU_DRIVER_OFFICIAL) &&
|
||||||
(strstr(renderer, "HD Graphics 620") || strstr(renderer, "HD Graphics 630"))) {
|
(strstr(renderer, "HD Graphics 620") || strstr(renderer, "HD Graphics 630"))) {
|
||||||
|
@ -43,7 +43,7 @@ class GLVaoCache;
|
|||||||
|
|
||||||
class GLSharedOrphanLists {
|
class GLSharedOrphanLists {
|
||||||
public:
|
public:
|
||||||
/** Mutex for the bellow structures. */
|
/** Mutex for the below structures. */
|
||||||
std::mutex lists_mutex;
|
std::mutex lists_mutex;
|
||||||
/** Buffers and textures are shared across context. Any context can free them. */
|
/** Buffers and textures are shared across context. Any context can free them. */
|
||||||
Vector<GLuint> textures;
|
Vector<GLuint> textures;
|
||||||
@ -92,7 +92,7 @@ class GLContext : public Context {
|
|||||||
*/
|
*/
|
||||||
Set<GLVaoCache *> vao_caches_;
|
Set<GLVaoCache *> vao_caches_;
|
||||||
Set<GPUFrameBuffer *> framebuffers_;
|
Set<GPUFrameBuffer *> framebuffers_;
|
||||||
/** Mutex for the bellow structures. */
|
/** Mutex for the below structures. */
|
||||||
std::mutex lists_mutex_;
|
std::mutex lists_mutex_;
|
||||||
/** VertexArrays and framebuffers are not shared across context. */
|
/** VertexArrays and framebuffers are not shared across context. */
|
||||||
Vector<GLuint> orphaned_vertarrays_;
|
Vector<GLuint> orphaned_vertarrays_;
|
||||||
|
@ -57,7 +57,7 @@ in float dummy;
|
|||||||
|
|
||||||
vec2 do_widget(void)
|
vec2 do_widget(void)
|
||||||
{
|
{
|
||||||
/* Offset to avoid loosing pixels (mimics conservative rasterization). */
|
/* Offset to avoid losing pixels (mimics conservative rasterization). */
|
||||||
const vec2 ofs = vec2(0.5, -0.5);
|
const vec2 ofs = vec2(0.5, -0.5);
|
||||||
lineWidth = abs(rect.x - recti.x);
|
lineWidth = abs(rect.x - recti.x);
|
||||||
vec2 emboss_ofs = vec2(0.0, -lineWidth);
|
vec2 emboss_ofs = vec2(0.0, -lineWidth);
|
||||||
|
@ -289,7 +289,7 @@ typedef struct Brush {
|
|||||||
|
|
||||||
int curve_preset;
|
int curve_preset;
|
||||||
|
|
||||||
/* Maximun distance to search fake neighbors from a vertex. */
|
/* Maximum distance to search fake neighbors from a vertex. */
|
||||||
float disconnected_distance_max;
|
float disconnected_distance_max;
|
||||||
|
|
||||||
int deform_target;
|
int deform_target;
|
||||||
|
@ -166,7 +166,7 @@ typedef struct ClothSimSettings {
|
|||||||
/** Mechanical damping of shear springs. */
|
/** Mechanical damping of shear springs. */
|
||||||
float shear_damp;
|
float shear_damp;
|
||||||
|
|
||||||
/** The maximum lenght an internal spring can have during creation. */
|
/** The maximum length an internal spring can have during creation. */
|
||||||
float internal_spring_max_length;
|
float internal_spring_max_length;
|
||||||
/** How much the interal spring can diverge from the vertex normal during creation. */
|
/** How much the interal spring can diverge from the vertex normal during creation. */
|
||||||
float internal_spring_max_diversion;
|
float internal_spring_max_diversion;
|
||||||
|
@ -182,7 +182,7 @@ typedef struct ThickGpencilModifierData {
|
|||||||
int flag;
|
int flag;
|
||||||
/** Relative thickness factor. */
|
/** Relative thickness factor. */
|
||||||
float thickness_fac;
|
float thickness_fac;
|
||||||
/** Absolute thickness overide. */
|
/** Absolute thickness override. */
|
||||||
int thickness;
|
int thickness;
|
||||||
/** Custom index for passes. */
|
/** Custom index for passes. */
|
||||||
int layer_pass;
|
int layer_pass;
|
||||||
|
@ -236,7 +236,7 @@
|
|||||||
.flag = 0, \
|
.flag = 0, \
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Defines are scattered accross too many files, they need to be moved to DNA. */
|
/* Defines are scattered across too many files, they need to be moved to DNA. */
|
||||||
#if 0
|
#if 0
|
||||||
#define _DNA_DEFAULT_DataTransferModifierData \
|
#define _DNA_DEFAULT_DataTransferModifierData \
|
||||||
{ \
|
{ \
|
||||||
|
@ -134,7 +134,7 @@ bool RNA_property_overridable_get(PointerRNA *ptr, PropertyRNA *prop)
|
|||||||
/* Special handling for insertions of constraints or modifiers... */
|
/* Special handling for insertions of constraints or modifiers... */
|
||||||
/* TODO Note We may want to add a more generic system to RNA
|
/* TODO Note We may want to add a more generic system to RNA
|
||||||
* (like a special property in struct of items)
|
* (like a special property in struct of items)
|
||||||
* if we get more overrideable collections,
|
* if we get more overridable collections,
|
||||||
* for now we can live with those special-cases handling I think. */
|
* for now we can live with those special-cases handling I think. */
|
||||||
if (RNA_struct_is_a(ptr->type, &RNA_Constraint)) {
|
if (RNA_struct_is_a(ptr->type, &RNA_Constraint)) {
|
||||||
bConstraint *con = ptr->data;
|
bConstraint *con = ptr->data;
|
||||||
|
@ -288,7 +288,7 @@ void RNA_api_mesh(StructRNA *srna)
|
|||||||
"Define custom split normals of this mesh "
|
"Define custom split normals of this mesh "
|
||||||
"(use zero-vectors to keep auto ones)");
|
"(use zero-vectors to keep auto ones)");
|
||||||
RNA_def_function_flag(func, FUNC_USE_REPORTS);
|
RNA_def_function_flag(func, FUNC_USE_REPORTS);
|
||||||
/* TODO, see how array size of 0 works, this shouldnt be used */
|
/* TODO, see how array size of 0 works, this shouldn't be used */
|
||||||
parm = RNA_def_float_array(func, "normals", 1, NULL, -1.0f, 1.0f, "", "Normals", 0.0f, 0.0f);
|
parm = RNA_def_float_array(func, "normals", 1, NULL, -1.0f, 1.0f, "", "Normals", 0.0f, 0.0f);
|
||||||
RNA_def_property_multi_array(parm, 2, normals_array_dim);
|
RNA_def_property_multi_array(parm, 2, normals_array_dim);
|
||||||
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
|
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
|
||||||
@ -301,7 +301,7 @@ void RNA_api_mesh(StructRNA *srna)
|
|||||||
"Define custom split normals of this mesh, from vertices' normals "
|
"Define custom split normals of this mesh, from vertices' normals "
|
||||||
"(use zero-vectors to keep auto ones)");
|
"(use zero-vectors to keep auto ones)");
|
||||||
RNA_def_function_flag(func, FUNC_USE_REPORTS);
|
RNA_def_function_flag(func, FUNC_USE_REPORTS);
|
||||||
/* TODO, see how array size of 0 works, this shouldnt be used */
|
/* TODO, see how array size of 0 works, this shouldn't be used */
|
||||||
parm = RNA_def_float_array(func, "normals", 1, NULL, -1.0f, 1.0f, "", "Normals", 0.0f, 0.0f);
|
parm = RNA_def_float_array(func, "normals", 1, NULL, -1.0f, 1.0f, "", "Normals", 0.0f, 0.0f);
|
||||||
RNA_def_property_multi_array(parm, 2, normals_array_dim);
|
RNA_def_property_multi_array(parm, 2, normals_array_dim);
|
||||||
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
|
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
|
||||||
|
@ -5381,7 +5381,7 @@ static void def_sh_tex_pointdensity(StructRNA *srna)
|
|||||||
func = RNA_def_function(srna, "calc_point_density", "rna_ShaderNodePointDensity_density_calc");
|
func = RNA_def_function(srna, "calc_point_density", "rna_ShaderNodePointDensity_density_calc");
|
||||||
RNA_def_function_ui_description(func, "Calculate point density");
|
RNA_def_function_ui_description(func, "Calculate point density");
|
||||||
RNA_def_pointer(func, "depsgraph", "Depsgraph", "", "");
|
RNA_def_pointer(func, "depsgraph", "Depsgraph", "", "");
|
||||||
/* TODO, See how array size of 0 works, this shouldnt be used. */
|
/* TODO, See how array size of 0 works, this shouldn't be used. */
|
||||||
parm = RNA_def_float_array(func, "rgba_values", 1, NULL, 0, 0, "", "RGBA Values", 0, 0);
|
parm = RNA_def_float_array(func, "rgba_values", 1, NULL, 0, 0, "", "RGBA Values", 0, 0);
|
||||||
RNA_def_parameter_flags(parm, PROP_DYNAMIC, 0);
|
RNA_def_parameter_flags(parm, PROP_DYNAMIC, 0);
|
||||||
RNA_def_function_output(func, parm);
|
RNA_def_function_output(func, parm);
|
||||||
|
@ -2122,7 +2122,7 @@ static void rna_def_vertex_group(BlenderRNA *brna)
|
|||||||
func = RNA_def_function(srna, "add", "rna_VertexGroup_vertex_add");
|
func = RNA_def_function(srna, "add", "rna_VertexGroup_vertex_add");
|
||||||
RNA_def_function_ui_description(func, "Add vertices to the group");
|
RNA_def_function_ui_description(func, "Add vertices to the group");
|
||||||
RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
|
RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
|
||||||
/* TODO, see how array size of 0 works, this shouldnt be used */
|
/* TODO, see how array size of 0 works, this shouldn't be used */
|
||||||
parm = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index List", 0, 0);
|
parm = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index List", 0, 0);
|
||||||
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
|
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
|
||||||
parm = RNA_def_float(func, "weight", 0, 0.0f, 1.0f, "", "Vertex weight", 0.0f, 1.0f);
|
parm = RNA_def_float(func, "weight", 0, 0.0f, 1.0f, "", "Vertex weight", 0.0f, 1.0f);
|
||||||
@ -2133,7 +2133,7 @@ static void rna_def_vertex_group(BlenderRNA *brna)
|
|||||||
func = RNA_def_function(srna, "remove", "rna_VertexGroup_vertex_remove");
|
func = RNA_def_function(srna, "remove", "rna_VertexGroup_vertex_remove");
|
||||||
RNA_def_function_ui_description(func, "Remove a vertex from the group");
|
RNA_def_function_ui_description(func, "Remove a vertex from the group");
|
||||||
RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
|
RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
|
||||||
/* TODO, see how array size of 0 works, this shouldnt be used */
|
/* TODO, see how array size of 0 works, this shouldn't be used */
|
||||||
parm = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index List", 0, 0);
|
parm = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index List", 0, 0);
|
||||||
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
|
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
|
||||||
|
|
||||||
@ -2180,14 +2180,14 @@ static void rna_def_face_map(BlenderRNA *brna)
|
|||||||
func = RNA_def_function(srna, "add", "rna_FaceMap_face_add");
|
func = RNA_def_function(srna, "add", "rna_FaceMap_face_add");
|
||||||
RNA_def_function_ui_description(func, "Add vertices to the group");
|
RNA_def_function_ui_description(func, "Add vertices to the group");
|
||||||
RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
|
RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
|
||||||
/* TODO, see how array size of 0 works, this shouldnt be used */
|
/* TODO, see how array size of 0 works, this shouldn't be used */
|
||||||
parm = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index List", 0, 0);
|
parm = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index List", 0, 0);
|
||||||
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
|
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
|
||||||
|
|
||||||
func = RNA_def_function(srna, "remove", "rna_FaceMap_face_remove");
|
func = RNA_def_function(srna, "remove", "rna_FaceMap_face_remove");
|
||||||
RNA_def_function_ui_description(func, "Remove a vertex from the group");
|
RNA_def_function_ui_description(func, "Remove a vertex from the group");
|
||||||
RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
|
RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
|
||||||
/* TODO, see how array size of 0 works, this shouldnt be used */
|
/* TODO, see how array size of 0 works, this shouldn't be used */
|
||||||
parm = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index List", 0, 0);
|
parm = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index List", 0, 0);
|
||||||
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
|
RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED);
|
||||||
}
|
}
|
||||||
|
@ -439,7 +439,7 @@ const EnumPropertyItem rna_enum_clip_editor_mode_items[] = {
|
|||||||
{0, NULL, 0, NULL, NULL},
|
{0, NULL, 0, NULL, NULL},
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Actually populated dynamically trough a function,
|
/* Actually populated dynamically through a function,
|
||||||
* but helps for context-less access (e.g. doc, i18n...). */
|
* but helps for context-less access (e.g. doc, i18n...). */
|
||||||
static const EnumPropertyItem buttons_context_items[] = {
|
static const EnumPropertyItem buttons_context_items[] = {
|
||||||
{BCONTEXT_TOOL, "TOOL", ICON_TOOL_SETTINGS, "Tool", "Active Tool and Workspace settings"},
|
{BCONTEXT_TOOL, "TOOL", ICON_TOOL_SETTINGS, "Tool", "Active Tool and Workspace settings"},
|
||||||
|
@ -437,13 +437,13 @@ BLI_INLINE int isPolyValid(const float coords[][2], const uint nr)
|
|||||||
for (int i = 0; i < nr; i++) {
|
for (int i = 0; i < nr; i++) {
|
||||||
sub_v2_v2v2(curr_vec, coords[i], prev_co);
|
sub_v2_v2v2(curr_vec, coords[i], prev_co);
|
||||||
|
|
||||||
/* Check ovelap between directly adjacent vertices. */
|
/* Check overlap between directly adjacent vertices. */
|
||||||
const float curr_len = normalize_v2(curr_vec);
|
const float curr_len = normalize_v2(curr_vec);
|
||||||
if (curr_len < FLT_EPSILON) {
|
if (curr_len < FLT_EPSILON) {
|
||||||
return MOD_SDEF_BIND_RESULT_OVERLAP_ERR;
|
return MOD_SDEF_BIND_RESULT_OVERLAP_ERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Check ovelap between vertices skipping one. */
|
/* Check overlap between vertices skipping one. */
|
||||||
if (len_squared_v2v2(prev_prev_co, coords[i]) < FLT_EPSILON * FLT_EPSILON) {
|
if (len_squared_v2v2(prev_prev_co, coords[i]) < FLT_EPSILON * FLT_EPSILON) {
|
||||||
return MOD_SDEF_BIND_RESULT_OVERLAP_ERR;
|
return MOD_SDEF_BIND_RESULT_OVERLAP_ERR;
|
||||||
}
|
}
|
||||||
|
@ -293,7 +293,7 @@ static int bpy_bmesh_select_mode_set(BPy_BMesh *self, PyObject *value)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (flag == 0) {
|
if (flag == 0) {
|
||||||
PyErr_SetString(PyExc_TypeError, "bm.select_mode: cant assignt an empty value");
|
PyErr_SetString(PyExc_TypeError, "bm.select_mode: can't assign an empty value");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1971,7 +1971,7 @@ void RE_RenderFrame(Render *re,
|
|||||||
if (write_still && !G.is_break) {
|
if (write_still && !G.is_break) {
|
||||||
if (BKE_imtype_is_movie(rd.im_format.imtype)) {
|
if (BKE_imtype_is_movie(rd.im_format.imtype)) {
|
||||||
/* operator checks this but in case its called from elsewhere */
|
/* operator checks this but in case its called from elsewhere */
|
||||||
printf("Error: cant write single images with a movie format!\n");
|
printf("Error: can't write single images with a movie format!\n");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
char name[FILE_MAX];
|
char name[FILE_MAX];
|
||||||
|
@ -51,7 +51,7 @@ typedef struct SeqRenderData {
|
|||||||
bool is_proxy_render;
|
bool is_proxy_render;
|
||||||
bool is_prefetch_render;
|
bool is_prefetch_render;
|
||||||
int view_id;
|
int view_id;
|
||||||
/* ID of task for asigning temp cache entries to particular task(thread, etc.) */
|
/* ID of task for assigning temp cache entries to particular task(thread, etc.) */
|
||||||
eSeqTaskId task_id;
|
eSeqTaskId task_id;
|
||||||
|
|
||||||
/* special case for OpenGL render */
|
/* special case for OpenGL render */
|
||||||
|
@ -166,7 +166,7 @@ typedef struct SeqCacheKey {
|
|||||||
float timeline_frame; /* Only for reference - used for freeing when cache is full. */
|
float timeline_frame; /* Only for reference - used for freeing when cache is full. */
|
||||||
float cost; /* In short: render time(s) divided by playback frame duration(s) */
|
float cost; /* In short: render time(s) divided by playback frame duration(s) */
|
||||||
bool is_temp_cache; /* this cache entry will be freed before rendering next frame */
|
bool is_temp_cache; /* this cache entry will be freed before rendering next frame */
|
||||||
/* ID of task for asigning temp cache entries to particular task(thread, etc.) */
|
/* ID of task for assigning temp cache entries to particular task(thread, etc.) */
|
||||||
eSeqTaskId task_id;
|
eSeqTaskId task_id;
|
||||||
int type;
|
int type;
|
||||||
} SeqCacheKey;
|
} SeqCacheKey;
|
||||||
|
@ -346,7 +346,7 @@ static const char *wm_area_name(ScrArea *area)
|
|||||||
SPACE_NAME(SPACE_TOPBAR);
|
SPACE_NAME(SPACE_TOPBAR);
|
||||||
SPACE_NAME(SPACE_STATUSBAR);
|
SPACE_NAME(SPACE_STATUSBAR);
|
||||||
default:
|
default:
|
||||||
return "Unkown Space";
|
return "Unknown Space";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2099,7 +2099,7 @@ static int wm_handler_operator_call(bContext *C,
|
|||||||
handler->op = NULL;
|
handler->op = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Putting back screen context, reval can pass trough after modal failures! */
|
/* Putting back screen context, reval can pass through after modal failures! */
|
||||||
if ((retval & OPERATOR_PASS_THROUGH) || wm_event_always_pass(event)) {
|
if ((retval & OPERATOR_PASS_THROUGH) || wm_event_always_pass(event)) {
|
||||||
CTX_wm_area_set(C, area);
|
CTX_wm_area_set(C, area);
|
||||||
CTX_wm_region_set(C, region);
|
CTX_wm_region_set(C, region);
|
||||||
|
@ -74,7 +74,7 @@ endif()
|
|||||||
if(WITH_TBB)
|
if(WITH_TBB)
|
||||||
blender_include_dirs(${TBB_INCLUDE_DIRS})
|
blender_include_dirs(${TBB_INCLUDE_DIRS})
|
||||||
if(NOT APPLE)
|
if(NOT APPLE)
|
||||||
# APPLE plaform uses full paths for linking libraries.
|
# APPLE platform uses full paths for linking libraries.
|
||||||
link_directories(${LIBDIR}/tbb/lib)
|
link_directories(${LIBDIR}/tbb/lib)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user