Merge branch 'master' into blender2.8
This commit is contained in:
commit
323a7ab944
@ -344,7 +344,6 @@ void device_network_info(vector<DeviceInfo>& devices)
|
||||
info.id = "NETWORK";
|
||||
info.num = 0;
|
||||
info.advanced_shading = true; /* todo: get this info from device */
|
||||
info.pack_images = false;
|
||||
|
||||
devices.push_back(info);
|
||||
}
|
||||
|
@ -807,9 +807,7 @@ ccl_device_forceinline float triangle_light_pdf(KernelGlobals *kg, ShaderData *s
|
||||
{
|
||||
/* A naive heuristic to decide between costly solid angle sampling
|
||||
* and simple area sampling, comparing the distance to the triangle plane
|
||||
* to the length of the edtes of the triangle.
|
||||
* Looking at two edge of the triangle should be a sufficient heuristic,
|
||||
* the third edge can't possibly be longer than the sum of the other two. */
|
||||
* to the length of the edges of the triangle. */
|
||||
|
||||
float3 V[3];
|
||||
bool has_motion = triangle_world_space_vertices(kg, sd->object, sd->prim, sd->time, V);
|
||||
@ -877,9 +875,7 @@ ccl_device_forceinline void triangle_light_sample(KernelGlobals *kg, int prim, i
|
||||
{
|
||||
/* A naive heuristic to decide between costly solid angle sampling
|
||||
* and simple area sampling, comparing the distance to the triangle plane
|
||||
* to the length of the edtes of the triangle.
|
||||
* Looking at two edge of the triangle should be a sufficient heuristic,
|
||||
* the third edge can't possibly be longer than the sum of the other two. */
|
||||
* to the length of the edges of the triangle. */
|
||||
|
||||
float3 V[3];
|
||||
bool has_motion = triangle_world_space_vertices(kg, object, prim, time, V);
|
||||
@ -968,21 +964,14 @@ ccl_device_forceinline void triangle_light_sample(KernelGlobals *kg, int prim, i
|
||||
const float z = 1.0f - randv * (1.0f - dot(C_, B));
|
||||
ls->D = z * B + safe_sqrtf(1.0f - z*z) * safe_normalize(C_ - dot(C_, B) * B);
|
||||
|
||||
/* calculate intersection with the planar triangle
|
||||
* mostly standard ray/tri intersection, with u/v clamped */
|
||||
const float3 s1 = cross(ls->D, e1);
|
||||
|
||||
const float divisor = dot(s1, e0);
|
||||
if(UNLIKELY(divisor == 0.0f)) {
|
||||
ls->pdf = 0.0f;
|
||||
return;
|
||||
}
|
||||
const float inv_divisor = 1.0f/divisor;
|
||||
const float3 d = P - V[0];
|
||||
ls->u = clamp(dot(d, s1)*inv_divisor, 0.0f, 1.0f);
|
||||
const float3 s2 = cross(d, e0);
|
||||
ls->v = clamp(dot(ls->D, s2)*inv_divisor, 0.0f, 1.0f);
|
||||
ls->t = dot(e1, s2)*inv_divisor;
|
||||
/* calculate intersection with the planar triangle */
|
||||
ray_triangle_intersect(P, ls->D, FLT_MAX,
|
||||
#if defined(__KERNEL_SSE2__) && defined(__KERNEL_SSE__)
|
||||
(ssef*)V,
|
||||
#else
|
||||
V[0], V[1], V[2],
|
||||
#endif
|
||||
&ls->u, &ls->v, &ls->t);
|
||||
ls->P = P + ls->D * ls->t;
|
||||
|
||||
/* pdf_triangles is calculated over triangle area, but we're sampling over solid angle */
|
||||
|
@ -347,7 +347,10 @@ __forceinline size_t __bscf(size_t& v)
|
||||
|
||||
#endif /* _WIN32 */
|
||||
|
||||
#if !(defined(__SSE4_1__) || defined(__SSE4_2__))
|
||||
/* Test __KERNEL_SSE41__ for MSVC which does not define __SSE4_1__, and test
|
||||
* __SSE4_1__ to avoid OpenImageIO conflicts with our emulation macros on other
|
||||
* platforms when compiling code outside the kernel. */
|
||||
#if !(defined(__KERNEL_SSE41__) || defined(__SSE4_1__) || defined(__SSE4_2__))
|
||||
|
||||
/* Emulation of SSE4 functions with SSE2 */
|
||||
|
||||
@ -361,7 +364,12 @@ __forceinline size_t __bscf(size_t& v)
|
||||
#define _mm_blendv_ps _mm_blendv_ps_emu
|
||||
__forceinline __m128 _mm_blendv_ps_emu( __m128 value, __m128 input, __m128 mask)
|
||||
{
|
||||
return _mm_or_ps(_mm_and_ps(mask, input), _mm_andnot_ps(mask, value));
|
||||
__m128i isignmask = _mm_set1_epi32(0x80000000);
|
||||
__m128 signmask = _mm_castsi128_ps(isignmask);
|
||||
__m128i iandsign = _mm_castps_si128(_mm_and_ps(mask, signmask));
|
||||
__m128i icmpmask = _mm_cmpeq_epi32(iandsign, isignmask);
|
||||
__m128 cmpmask = _mm_castsi128_ps(icmpmask);
|
||||
return _mm_or_ps(_mm_and_ps(cmpmask, input), _mm_andnot_ps(cmpmask, value));
|
||||
}
|
||||
|
||||
#undef _mm_blend_ps
|
||||
@ -435,7 +443,7 @@ __forceinline __m128 _mm_round_ps_emu( __m128 value, const int flags)
|
||||
return value;
|
||||
}
|
||||
|
||||
#endif /* !(defined(__SSE4_1__) || defined(__SSE4_2__)) */
|
||||
#endif /* !(defined(__KERNEL_SSE41__) || defined(__SSE4_1__) || defined(__SSE4_2__)) */
|
||||
|
||||
#else /* __KERNEL_SSE2__ */
|
||||
|
||||
|
@ -358,10 +358,10 @@ AbcObjectReader *create_reader(const Alembic::AbcGeom::IObject &object, ImportSe
|
||||
reader = new AbcCurveReader(object, settings);
|
||||
}
|
||||
else {
|
||||
std::cerr << "Alembic: unknown how to handle objects of schema "
|
||||
std::cerr << "Alembic: unknown how to handle objects of schema '"
|
||||
<< md.get("schemaObjTitle")
|
||||
<< ", skipping object "
|
||||
<< object.getFullName() << std::endl;
|
||||
<< "', skipping object '"
|
||||
<< object.getFullName() << "'" << std::endl;
|
||||
}
|
||||
|
||||
return reader;
|
||||
|
@ -1026,6 +1026,10 @@ CacheReader *CacheReader_open_alembic_object(AbcArchiveHandle *handle, CacheRead
|
||||
|
||||
ImportSettings settings;
|
||||
AbcObjectReader *abc_reader = create_reader(iobject, settings);
|
||||
if (abc_reader == NULL) {
|
||||
/* This object is not supported */
|
||||
return NULL;
|
||||
}
|
||||
abc_reader->object(object);
|
||||
abc_reader->incref();
|
||||
|
||||
|
@ -1930,7 +1930,7 @@ static void samevolume_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *
|
||||
|
||||
/* calculate normalizing scale factor for non-essential values */
|
||||
if (obsize[data->flag] != 0)
|
||||
fac = sqrtf(volume / obsize[data->flag]) / obsize[data->flag];
|
||||
fac = sqrtf(volume / obsize[data->flag]);
|
||||
|
||||
/* apply scaling factor to the channels not being kept */
|
||||
switch (data->flag) {
|
||||
|
@ -2099,6 +2099,12 @@ void BKE_mesh_mselect_active_set(Mesh *me, int index, int type)
|
||||
(me->mselect[me->totselect - 1].type == type));
|
||||
}
|
||||
|
||||
/**
|
||||
* Compute 'split' (aka loop, or per face corner's) normals.
|
||||
*
|
||||
* \param r_lnors_spacearr Allows to get computed loop normal space array. That data, among other things,
|
||||
* contains 'smooth fan' info, useful e.g. to split geometry along sharp edges...
|
||||
*/
|
||||
void BKE_mesh_calc_normals_split_ex(Mesh *mesh, MLoopNorSpaceArray *r_lnors_spacearr)
|
||||
{
|
||||
float (*r_loopnors)[3];
|
||||
@ -2134,7 +2140,10 @@ void BKE_mesh_calc_normals_split_ex(Mesh *mesh, MLoopNorSpaceArray *r_lnors_spac
|
||||
BKE_mesh_normals_loop_split(
|
||||
mesh->mvert, mesh->totvert, mesh->medge, mesh->totedge,
|
||||
mesh->mloop, r_loopnors, mesh->totloop, mesh->mpoly, (const float (*)[3])polynors, mesh->totpoly,
|
||||
(mesh->flag & ME_AUTOSMOOTH) != 0, mesh->smoothresh, r_lnors_spacearr, clnors, NULL);
|
||||
/* Note that we enforce computing clnors when the clnor space array is requested by caller here.
|
||||
* However, we obviously only use the autosmooth angle threshold only in case autosmooth is enabled. */
|
||||
r_lnors_spacearr != NULL, (mesh->flag & ME_AUTOSMOOTH) != 0 ? mesh->smoothresh : (float)M_PI,
|
||||
r_lnors_spacearr, clnors, NULL);
|
||||
|
||||
if (free_polynors) {
|
||||
MEM_freeN(polynors);
|
||||
@ -2166,118 +2175,70 @@ typedef struct SplitFaceNewEdge {
|
||||
/* Detect needed new vertices, and update accordingly loops' vertex indices.
|
||||
* WARNING! Leaves mesh in invalid state. */
|
||||
static int split_faces_prepare_new_verts(
|
||||
const Mesh *mesh, MLoopNorSpaceArray *lnors_spacearr, SplitFaceNewVert **new_verts, MemArena *memarena,
|
||||
bool *r_need_vnors_recalc)
|
||||
const Mesh *mesh, MLoopNorSpaceArray *lnors_spacearr, SplitFaceNewVert **new_verts, MemArena *memarena)
|
||||
{
|
||||
/* Note: if lnors_spacearr is NULL, ther is no autosmooth handling, and we only split out flat polys. */
|
||||
/* This is now mandatory, trying to do the job in simple way without that data is doomed to fail, even when only
|
||||
* dealing with smooth/flat faces one can find cases that no simple algorithm can handle properly. */
|
||||
BLI_assert(lnors_spacearr != NULL);
|
||||
|
||||
const int num_loops = mesh->totloop;
|
||||
int num_verts = mesh->totvert;
|
||||
MVert *mvert = mesh->mvert;
|
||||
MLoop *mloop = mesh->mloop;
|
||||
|
||||
BLI_bitmap *verts_used = BLI_BITMAP_NEW(num_verts, __func__);
|
||||
BLI_bitmap *done_loops = BLI_BITMAP_NEW(num_loops, __func__);
|
||||
|
||||
if (lnors_spacearr) {
|
||||
BLI_bitmap *done_loops = BLI_BITMAP_NEW(num_loops, __func__);
|
||||
MLoop *ml = mloop;
|
||||
MLoopNorSpace **lnor_space = lnors_spacearr->lspacearr;
|
||||
|
||||
MLoop *ml = mloop;
|
||||
MLoopNorSpace **lnor_space = lnors_spacearr->lspacearr;
|
||||
for (int loop_idx = 0; loop_idx < num_loops; loop_idx++, ml++, lnor_space++) {
|
||||
if (!BLI_BITMAP_TEST(done_loops, loop_idx)) {
|
||||
const int vert_idx = ml->v;
|
||||
const bool vert_used = BLI_BITMAP_TEST_BOOL(verts_used, vert_idx);
|
||||
/* If vert is already used by another smooth fan, we need a new vert for this one. */
|
||||
const int new_vert_idx = vert_used ? num_verts++ : vert_idx;
|
||||
for (int loop_idx = 0; loop_idx < num_loops; loop_idx++, ml++, lnor_space++) {
|
||||
if (!BLI_BITMAP_TEST(done_loops, loop_idx)) {
|
||||
const int vert_idx = ml->v;
|
||||
const bool vert_used = BLI_BITMAP_TEST_BOOL(verts_used, vert_idx);
|
||||
/* If vert is already used by another smooth fan, we need a new vert for this one. */
|
||||
const int new_vert_idx = vert_used ? num_verts++ : vert_idx;
|
||||
|
||||
BLI_assert(*lnor_space);
|
||||
BLI_assert(*lnor_space);
|
||||
|
||||
if ((*lnor_space)->loops) {
|
||||
for (LinkNode *lnode = (*lnor_space)->loops; lnode; lnode = lnode->next) {
|
||||
const int ml_fan_idx = GET_INT_FROM_POINTER(lnode->link);
|
||||
BLI_BITMAP_ENABLE(done_loops, ml_fan_idx);
|
||||
if (vert_used) {
|
||||
mloop[ml_fan_idx].v = new_vert_idx;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
/* Single loop in this fan... */
|
||||
BLI_BITMAP_ENABLE(done_loops, loop_idx);
|
||||
if ((*lnor_space)->loops) {
|
||||
for (LinkNode *lnode = (*lnor_space)->loops; lnode; lnode = lnode->next) {
|
||||
const int ml_fan_idx = GET_INT_FROM_POINTER(lnode->link);
|
||||
BLI_BITMAP_ENABLE(done_loops, ml_fan_idx);
|
||||
if (vert_used) {
|
||||
ml->v = new_vert_idx;
|
||||
mloop[ml_fan_idx].v = new_vert_idx;
|
||||
}
|
||||
}
|
||||
|
||||
if (!vert_used) {
|
||||
BLI_BITMAP_ENABLE(verts_used, vert_idx);
|
||||
/* We need to update that vertex's normal here, we won't go over it again. */
|
||||
/* This is important! *DO NOT* set vnor to final computed lnor, vnor should always be defined to
|
||||
* 'automatic normal' value computed from its polys, not some custom normal.
|
||||
* Fortunately, that's the loop normal space's 'lnor' reference vector. ;) */
|
||||
normal_float_to_short_v3(mvert[vert_idx].no, (*lnor_space)->vec_lnor);
|
||||
}
|
||||
else {
|
||||
/* Add new vert to list. */
|
||||
SplitFaceNewVert *new_vert = BLI_memarena_alloc(memarena, sizeof(*new_vert));
|
||||
new_vert->orig_index = vert_idx;
|
||||
new_vert->new_index = new_vert_idx;
|
||||
new_vert->vnor = (*lnor_space)->vec_lnor; /* See note above. */
|
||||
new_vert->next = *new_verts;
|
||||
*new_verts = new_vert;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
MEM_freeN(done_loops);
|
||||
}
|
||||
else {
|
||||
/* No loop normal spaces available, we only split out flat polys. */
|
||||
const int num_polys = mesh->totpoly;
|
||||
const MPoly *mpoly = mesh->mpoly;
|
||||
|
||||
/* We do that in two loops, to keep original edges/verts to smooth polys preferencially. */
|
||||
const MPoly *mp = mpoly;
|
||||
for (int i = 0; i < num_polys; i++, mp++) {
|
||||
if (mp->flag & ME_SMOOTH) {
|
||||
const MLoop *ml = &mloop[mp->loopstart];
|
||||
for (int j = 0; j < mp->totloop; j++, ml++) {
|
||||
/* Just mark the vertex as used/reserved, that way neighbor flat polys, if any,
|
||||
* will have to create their own. */
|
||||
BLI_BITMAP_ENABLE(verts_used, ml->v);
|
||||
else {
|
||||
/* Single loop in this fan... */
|
||||
BLI_BITMAP_ENABLE(done_loops, loop_idx);
|
||||
if (vert_used) {
|
||||
ml->v = new_vert_idx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
mp = mpoly;
|
||||
for (int i = 0; i < num_polys; i++, mp++) {
|
||||
if (!(mp->flag & ME_SMOOTH)) {
|
||||
MLoop *ml = &mloop[mp->loopstart];
|
||||
for (int j = 0; j < mp->totloop; j++, ml++) {
|
||||
const int vert_idx = ml->v;
|
||||
|
||||
if (BLI_BITMAP_TEST(verts_used, vert_idx)) {
|
||||
/* Add new vert to list. */
|
||||
const int new_vert_idx = num_verts++;
|
||||
ml->v = new_vert_idx;
|
||||
|
||||
SplitFaceNewVert *new_vert = BLI_memarena_alloc(memarena, sizeof(*new_vert));
|
||||
new_vert->orig_index = vert_idx;
|
||||
new_vert->new_index = new_vert_idx;
|
||||
new_vert->vnor = NULL; /* See note below about normals. */
|
||||
new_vert->next = *new_verts;
|
||||
*new_verts = new_vert;
|
||||
}
|
||||
else {
|
||||
BLI_BITMAP_ENABLE(verts_used, vert_idx);
|
||||
}
|
||||
}
|
||||
/* Note: there is no way to get new normals for smooth vertices here (and we don't have direct access
|
||||
* to poly normals either for flat ones), so we'll have to recompute all vnors at the end... */
|
||||
*r_need_vnors_recalc = true;
|
||||
if (!vert_used) {
|
||||
BLI_BITMAP_ENABLE(verts_used, vert_idx);
|
||||
/* We need to update that vertex's normal here, we won't go over it again. */
|
||||
/* This is important! *DO NOT* set vnor to final computed lnor, vnor should always be defined to
|
||||
* 'automatic normal' value computed from its polys, not some custom normal.
|
||||
* Fortunately, that's the loop normal space's 'lnor' reference vector. ;) */
|
||||
normal_float_to_short_v3(mvert[vert_idx].no, (*lnor_space)->vec_lnor);
|
||||
}
|
||||
else {
|
||||
/* Add new vert to list. */
|
||||
SplitFaceNewVert *new_vert = BLI_memarena_alloc(memarena, sizeof(*new_vert));
|
||||
new_vert->orig_index = vert_idx;
|
||||
new_vert->new_index = new_vert_idx;
|
||||
new_vert->vnor = (*lnor_space)->vec_lnor; /* See note above. */
|
||||
new_vert->next = *new_verts;
|
||||
*new_verts = new_vert;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
MEM_freeN(done_loops);
|
||||
MEM_freeN(verts_used);
|
||||
|
||||
return num_verts - mesh->totvert;
|
||||
@ -2396,27 +2357,17 @@ void BKE_mesh_split_faces(Mesh *mesh, bool free_loop_normals)
|
||||
}
|
||||
BKE_mesh_tessface_clear(mesh);
|
||||
|
||||
MLoopNorSpaceArray *lnors_spacearr = NULL;
|
||||
MemArena *memarena;
|
||||
bool need_vnors_recalc = false;
|
||||
|
||||
if (mesh->flag & ME_AUTOSMOOTH) {
|
||||
lnors_spacearr = MEM_callocN(sizeof(*lnors_spacearr), __func__);
|
||||
/* Compute loop normals and loop normal spaces (a.k.a. smooth fans of faces around vertices). */
|
||||
BKE_mesh_calc_normals_split_ex(mesh, lnors_spacearr);
|
||||
/* Stealing memarena from loop normals space array. */
|
||||
memarena = lnors_spacearr->mem;
|
||||
}
|
||||
else {
|
||||
/* We still have to split out flat faces... */
|
||||
memarena = BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, __func__);
|
||||
}
|
||||
MLoopNorSpaceArray lnors_spacearr = {NULL};
|
||||
/* Compute loop normals and loop normal spaces (a.k.a. smooth fans of faces around vertices). */
|
||||
BKE_mesh_calc_normals_split_ex(mesh, &lnors_spacearr);
|
||||
/* Stealing memarena from loop normals space array. */
|
||||
MemArena *memarena = lnors_spacearr.mem;
|
||||
|
||||
SplitFaceNewVert *new_verts = NULL;
|
||||
SplitFaceNewEdge *new_edges = NULL;
|
||||
|
||||
/* Detect loop normal spaces (a.k.a. smooth fans) that will need a new vert. */
|
||||
const int num_new_verts = split_faces_prepare_new_verts(mesh, lnors_spacearr, &new_verts, memarena, &need_vnors_recalc);
|
||||
const int num_new_verts = split_faces_prepare_new_verts(mesh, &lnors_spacearr, &new_verts, memarena);
|
||||
|
||||
if (num_new_verts > 0) {
|
||||
/* Reminder: beyond this point, there is no way out, mesh is in invalid state (due to early-reassignment of
|
||||
@ -2428,9 +2379,9 @@ void BKE_mesh_split_faces(Mesh *mesh, bool free_loop_normals)
|
||||
|
||||
/* Reallocate all vert and edge related data. */
|
||||
mesh->totvert += num_new_verts;
|
||||
mesh->totedge += num_new_edges;
|
||||
CustomData_realloc(&mesh->vdata, mesh->totvert);
|
||||
if (do_edges) {
|
||||
mesh->totedge += num_new_edges;
|
||||
CustomData_realloc(&mesh->edata, mesh->totedge);
|
||||
}
|
||||
/* Update pointers to a newly allocated memory. */
|
||||
@ -2450,18 +2401,9 @@ void BKE_mesh_split_faces(Mesh *mesh, bool free_loop_normals)
|
||||
CustomData_free_layers(&mesh->ldata, CD_NORMAL, mesh->totloop);
|
||||
}
|
||||
|
||||
if (lnors_spacearr) {
|
||||
/* Also frees new_verts/edges temp data, since we used its memarena to allocate them. */
|
||||
BKE_lnor_spacearr_free(lnors_spacearr);
|
||||
MEM_freeN(lnors_spacearr);
|
||||
}
|
||||
else {
|
||||
BLI_memarena_free(memarena);
|
||||
}
|
||||
/* Also frees new_verts/edges temp data, since we used its memarena to allocate them. */
|
||||
BKE_lnor_spacearr_free(&lnors_spacearr);
|
||||
|
||||
if (need_vnors_recalc) {
|
||||
BKE_mesh_calc_normals(mesh);
|
||||
}
|
||||
#ifdef VALIDATE_MESH
|
||||
BKE_mesh_validate(mesh, true, true);
|
||||
#endif
|
||||
|
@ -484,6 +484,9 @@ bool UI_context_copy_to_selected_list(
|
||||
else if (RNA_struct_is_a(ptr->type, &RNA_Sequence)) {
|
||||
*r_lb = CTX_data_collection_get(C, "selected_editable_sequences");
|
||||
}
|
||||
else if (RNA_struct_is_a(ptr->type, &RNA_FCurve)) {
|
||||
*r_lb = CTX_data_collection_get(C, "selected_editable_fcurves");
|
||||
}
|
||||
else if (RNA_struct_is_a(ptr->type, &RNA_Node) ||
|
||||
RNA_struct_is_a(ptr->type, &RNA_NodeSocket))
|
||||
{
|
||||
|
@ -2262,6 +2262,11 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, SceneLayer
|
||||
if (didit) {
|
||||
Key *key = BKE_key_from_object(obn);
|
||||
|
||||
Key *oldkey = BKE_key_from_object(ob);
|
||||
if (oldkey != NULL) {
|
||||
ID_NEW_SET(oldkey, key);
|
||||
}
|
||||
|
||||
if (dupflag & USER_DUP_ACT) {
|
||||
bActuator *act;
|
||||
|
||||
|
@ -57,6 +57,7 @@
|
||||
|
||||
#include "ED_armature.h"
|
||||
#include "ED_gpencil.h"
|
||||
#include "ED_anim_api.h"
|
||||
|
||||
#include "WM_api.h"
|
||||
#include "UI_interface.h"
|
||||
@ -78,7 +79,7 @@ const char *screen_context_dir[] = {
|
||||
"visible_gpencil_layers", "editable_gpencil_layers", "editable_gpencil_strokes",
|
||||
"active_gpencil_layer", "active_gpencil_frame", "active_gpencil_palette",
|
||||
"active_gpencil_palettecolor", "active_gpencil_brush",
|
||||
"active_operator",
|
||||
"active_operator", "selected_editable_fcurves",
|
||||
NULL};
|
||||
|
||||
int ed_screen_context(const bContext *C, const char *member, bContextDataResult *result)
|
||||
@ -609,6 +610,30 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
else if (CTX_data_equals(member, "selected_editable_fcurves"))
|
||||
{
|
||||
bAnimContext ac;
|
||||
|
||||
if (ANIM_animdata_get_context(C, &ac) && ELEM(ac.spacetype, SPACE_ACTION, SPACE_IPO)) {
|
||||
bAnimListElem *ale;
|
||||
ListBase anim_data = {NULL, NULL};
|
||||
|
||||
int filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS | ANIMFILTER_SEL) |
|
||||
(ac.spacetype == SPACE_IPO ? ANIMFILTER_CURVE_VISIBLE : ANIMFILTER_LIST_VISIBLE);
|
||||
|
||||
ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
|
||||
|
||||
for (ale = anim_data.first; ale; ale = ale->next) {
|
||||
if (ale->type == ANIMTYPE_FCURVE)
|
||||
CTX_data_list_add(result, ale->id, &RNA_FCurve, ale->data);
|
||||
}
|
||||
|
||||
ANIM_animdata_freelist(&anim_data);
|
||||
|
||||
CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
else {
|
||||
return 0; /* not found */
|
||||
}
|
||||
|
@ -274,7 +274,7 @@ static StructRNA *rna_KeyingSetInfo_register(Main *bmain, ReportList *reports, v
|
||||
if (ksi && ksi->ext.srna) {
|
||||
rna_KeyingSetInfo_unregister(bmain, ksi->ext.srna);
|
||||
}
|
||||
if (!RNA_struct_available_or_report(reports, identifier)) {
|
||||
if (!RNA_struct_available_or_report(reports, dummyksi.idname)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -637,7 +637,7 @@ static StructRNA *rna_NodeTree_register(
|
||||
if (nt) {
|
||||
rna_NodeTree_unregister(bmain, nt->ext.srna);
|
||||
}
|
||||
if (!RNA_struct_available_or_report(reports, identifier)) {
|
||||
if (!RNA_struct_available_or_report(reports, dummynt.idname)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -1397,16 +1397,13 @@ static bNodeType *rna_Node_register_base(Main *bmain, ReportList *reports, Struc
|
||||
identifier, (int)sizeof(dummynt.idname));
|
||||
return NULL;
|
||||
}
|
||||
if (!RNA_struct_available_or_report(reports, identifier)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* check if we have registered this node type before, and remove it */
|
||||
nt = nodeTypeFind(dummynt.idname);
|
||||
if (nt) {
|
||||
rna_Node_unregister(bmain, nt->ext.srna);
|
||||
}
|
||||
if (!RNA_struct_available_or_report(reports, identifier)) {
|
||||
if (!RNA_struct_available_or_report(reports, dummynt.idname)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -341,7 +341,7 @@ static StructRNA *rna_RenderEngine_register(Main *bmain, ReportList *reports, vo
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!RNA_struct_available_or_report(reports, identifier)) {
|
||||
if (!RNA_struct_available_or_report(reports, dummyet.idname)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -229,7 +229,7 @@ static StructRNA *rna_Panel_register(Main *bmain, ReportList *reports, void *dat
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!RNA_struct_available_or_report(reports, identifier)) {
|
||||
if (!RNA_struct_available_or_report(reports, dummypt.idname)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -494,7 +494,7 @@ static StructRNA *rna_UIList_register(Main *bmain, ReportList *reports, void *da
|
||||
if (ult && ult->ext.srna) {
|
||||
rna_UIList_unregister(bmain, ult->ext.srna);
|
||||
}
|
||||
if (!RNA_struct_available_or_report(reports, identifier)) {
|
||||
if (!RNA_struct_available_or_report(reports, dummyult.idname)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -599,7 +599,7 @@ static StructRNA *rna_Header_register(Main *bmain, ReportList *reports, void *da
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!RNA_struct_available_or_report(reports, identifier)) {
|
||||
if (!RNA_struct_available_or_report(reports, dummyht.idname)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -725,7 +725,7 @@ static StructRNA *rna_Menu_register(Main *bmain, ReportList *reports, void *data
|
||||
if (mt && mt->ext.srna) {
|
||||
rna_Menu_unregister(bmain, mt->ext.srna);
|
||||
}
|
||||
if (!RNA_struct_available_or_report(reports, identifier)) {
|
||||
if (!RNA_struct_available_or_report(reports, dummymt.idname)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -1246,18 +1246,21 @@ static StructRNA *rna_Operator_register(
|
||||
if (ot && ot->ext.srna)
|
||||
rna_Operator_unregister(bmain, ot->ext.srna);
|
||||
}
|
||||
if (!RNA_struct_available_or_report(reports, identifier)) {
|
||||
|
||||
if (!WM_operator_py_idname_ok_or_report(reports, identifier, dummyot.idname)) {
|
||||
return NULL;
|
||||
}
|
||||
if (!WM_operator_py_idname_ok_or_report(reports, identifier, temp_buffers.idname)) {
|
||||
|
||||
char idname_conv[sizeof(dummyop.idname)];
|
||||
WM_operator_bl_idname(idname_conv, dummyot.idname); /* convert the idname from python */
|
||||
|
||||
if (!RNA_struct_available_or_report(reports, idname_conv)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Convert foo.bar to FOO_OT_bar
|
||||
* allocate all strings at once. */
|
||||
{
|
||||
char idname_conv[sizeof(dummyop.idname)];
|
||||
WM_operator_bl_idname(idname_conv, temp_buffers.idname); /* convert the idname from python */
|
||||
const char *strings[] = {
|
||||
idname_conv,
|
||||
temp_buffers.name,
|
||||
@ -1384,18 +1387,21 @@ static StructRNA *rna_MacroOperator_register(
|
||||
if (ot && ot->ext.srna)
|
||||
rna_Operator_unregister(bmain, ot->ext.srna);
|
||||
}
|
||||
if (!RNA_struct_available_or_report(reports, identifier)) {
|
||||
|
||||
if (!WM_operator_py_idname_ok_or_report(reports, identifier, dummyot.idname)) {
|
||||
return NULL;
|
||||
}
|
||||
if (!WM_operator_py_idname_ok_or_report(reports, identifier, temp_buffers.idname)) {
|
||||
|
||||
char idname_conv[sizeof(dummyop.idname)];
|
||||
WM_operator_bl_idname(idname_conv, dummyot.idname); /* convert the idname from python */
|
||||
|
||||
if (!RNA_struct_available_or_report(reports, idname_conv)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Convert foo.bar to FOO_OT_bar
|
||||
* allocate all strings at once. */
|
||||
{
|
||||
char idname_conv[sizeof(dummyop.idname)];
|
||||
WM_operator_bl_idname(idname_conv, temp_buffers.idname); /* convert the idname from python */
|
||||
const char *strings[] = {
|
||||
idname_conv,
|
||||
temp_buffers.name,
|
||||
|
@ -468,7 +468,7 @@ static StructRNA *rna_Manipulator_register(
|
||||
rna_Manipulator_unregister(bmain, wt->ext.srna);
|
||||
}
|
||||
}
|
||||
if (!RNA_struct_available_or_report(reports, identifier)) {
|
||||
if (!RNA_struct_available_or_report(reports, dummywt.idname)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -773,7 +773,7 @@ static StructRNA *rna_ManipulatorGroup_register(
|
||||
rna_ManipulatorGroup_unregister(bmain, wgt->ext.srna);
|
||||
}
|
||||
}
|
||||
if (!RNA_struct_available_or_report(reports, identifier)) {
|
||||
if (!RNA_struct_available_or_report(reports, dummywgt.idname)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -544,6 +544,7 @@ if(WITH_CYCLES)
|
||||
add_cycles_render_test(reports)
|
||||
add_cycles_render_test(render)
|
||||
add_cycles_render_test(shader)
|
||||
add_cycles_render_test(shader_tangent)
|
||||
add_cycles_render_test(shadow_catcher)
|
||||
add_cycles_render_test(volume)
|
||||
else()
|
||||
|
Loading…
Reference in New Issue
Block a user