[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46191] trunk/blender: Fixes for recent cycles and python/context commits.

[Brecht Van Lommel]

Revision: 46191
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46191
Author:   blendix
Date:     2012-05-02 14:22:22 +0000 (Wed, 02 May 2012)
Log Message:
-----------
Fixes for recent cycles and python/context commits.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_types.h
    trunk/blender/source/blender/blenkernel/intern/context.c

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h	2012-05-02 14:16:35 UTC (rev 46190)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h	2012-05-02 14:22:22 UTC (rev 46191)
@@ -38,7 +38,7 @@
 /* device capabilities */
 #ifdef __KERNEL_CPU__
 #define __KERNEL_SHADING__
-//#define __KERNEL_ADV_SHADING__
+#define __KERNEL_ADV_SHADING__
 #endif
 
 #ifdef __KERNEL_CUDA__

Modified: trunk/blender/source/blender/blenkernel/intern/context.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/context.c	2012-05-02 14:16:35 UTC (rev 46190)
+++ trunk/blender/source/blender/blenkernel/intern/context.c	2012-05-02 14:22:22 UTC (rev 46191)
@@ -427,6 +427,9 @@
 {
 	bContextDataResult result;
 	ListBase lb;
+	bScreen *sc;
+	ScrArea *sa;
+	ARegion *ar;
 	int a;
 
 	memset(&lb, 0, sizeof(lb));
@@ -437,24 +440,24 @@
 		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 @@
 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;
 }