sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fixes for recent cycles and python/context commits.

Browse Source
This commit is contained in:
Brecht Van Lommel 2012-05-02 14:22:22 +00:00
parent 3224ac738e
commit 30c2abd323
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/kernel_types.h
View File

@ -38,7 +38,7 @@ CCL_NAMESPACE_BEGIN
/* device capabilities */
#ifdef __KERNEL_CPU__
#define __KERNEL_SHADING__
//#define __KERNEL_ADV_SHADING__
#define __KERNEL_ADV_SHADING__
#endif
#ifdef __KERNEL_CUDA__

21
source/blender/blenkernel/intern/context.c
View File

@ -427,6 +427,9 @@ ListBase CTX_data_dir_get(const bContext *C)
{
bContextDataResult result;
ListBase lb;
bScreen *sc;
ScrArea *sa;
ARegion *ar;
int a;
memset(&lb, 0, sizeof(lb));
@ -437,24 +440,24 @@ ListBase CTX_data_dir_get(const bContext *C)
for (entry=C->wm.store->entries.first; entry; entry=entry->next)
data_dir_add(&lb, entry->name);
}
if (C->wm.region && C->wm.region->type && C->wm.region->type->context) {
if ((ar=CTX_wm_region(C)) && ar->type && ar->type->context) {
memset(&result, 0, sizeof(result));
C->wm.region->type->context(C, "", &result);
ar->type->context(C, "", &result);
if (result.dir)
for (a=0; result.dir[a]; a++)
data_dir_add(&lb, result.dir[a]);
}
if (C->wm.area && C->wm.area->type && C->wm.area->type->context) {
if ((sa=CTX_wm_area(C)) && sa->type && sa->type->context) {
memset(&result, 0, sizeof(result));
C->wm.area->type->context(C, "", &result);
sa->type->context(C, "", &result);
if (result.dir)
for (a=0; result.dir[a]; a++)
data_dir_add(&lb, result.dir[a]);
}
if (C->wm.screen && C->wm.screen->context) {
bContextDataCallback cb= C->wm.screen->context;
if ((sc=CTX_wm_screen(C)) && sc->context) {
bContextDataCallback cb= sc->context;
memset(&result, 0, sizeof(result));
cb(C, "", &result);
@ -599,9 +602,11 @@ View3D *CTX_wm_view3d(const bContext *C)
RegionView3D *CTX_wm_region_view3d(const bContext *C)
{
ScrArea *sa = CTX_wm_area(C);
ARegion *ar = CTX_wm_region(C);
if (sa && sa->spacetype==SPACE_VIEW3D)
if (C->wm.region)
return C->wm.region->regiondata;
if (ar)
return ar->regiondata;
return NULL;
}