Merged changes in the trunk up to revision 46557.

Conflicts resolved:
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/makesrna/intern/rna_scene.c

Additional changes:
* Fix for recent changes of BKE_* function renaming.
* Fix for an "attempt to free NULL pointer" in BlenderStrokeRenderer::RenderStrokeRepBasic().

1 files changed, 59 insertions, 59 deletions

diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c
index 7e9ccdfb414..d1737fcd065 100644
--- a/source/blender/editors/space_buttons/space_buttons.c
+++ b/source/blender/editors/space_buttons/space_buttons.c
@@ -55,7 +55,7 @@
 
 #include "ED_render.h"
 
-#include "buttons_intern.h"	// own include
+#include "buttons_intern.h"  /* own include */
 
 /* ******************** default callbacks for buttons space ***************** */
 
@@ -64,30 +64,30 @@ static SpaceLink *buttons_new(const bContext *UNUSED(C))
 	ARegion *ar;
 	SpaceButs *sbuts;
 	
-	sbuts= MEM_callocN(sizeof(SpaceButs), "initbuts");
-	sbuts->spacetype= SPACE_BUTS;
-	sbuts->align= BUT_VERTICAL;
+	sbuts = MEM_callocN(sizeof(SpaceButs), "initbuts");
+	sbuts->spacetype = SPACE_BUTS;
+	sbuts->align = BUT_VERTICAL;
 
 	/* header */
-	ar= MEM_callocN(sizeof(ARegion), "header for buts");
+	ar = MEM_callocN(sizeof(ARegion), "header for buts");
 	
 	BLI_addtail(&sbuts->regionbase, ar);
-	ar->regiontype= RGN_TYPE_HEADER;
-	ar->alignment= RGN_ALIGN_TOP;
+	ar->regiontype = RGN_TYPE_HEADER;
+	ar->alignment = RGN_ALIGN_TOP;
 	
 #if 0
 	/* context area */
-	ar= MEM_callocN(sizeof(ARegion), "context area for buts");
+	ar = MEM_callocN(sizeof(ARegion), "context area for buts");
 	BLI_addtail(&sbuts->regionbase, ar);
-	ar->regiontype= RGN_TYPE_CHANNELS;
-	ar->alignment= RGN_ALIGN_TOP;
+	ar->regiontype = RGN_TYPE_CHANNELS;
+	ar->alignment = RGN_ALIGN_TOP;
 #endif
 
 	/* main area */
-	ar= MEM_callocN(sizeof(ARegion), "main area for buts");
+	ar = MEM_callocN(sizeof(ARegion), "main area for buts");
 	
 	BLI_addtail(&sbuts->regionbase, ar);
-	ar->regiontype= RGN_TYPE_WINDOW;
+	ar->regiontype = RGN_TYPE_WINDOW;
 	
 	return (SpaceLink *)sbuts;
 }
@@ -95,13 +95,13 @@ static SpaceLink *buttons_new(const bContext *UNUSED(C))
 /* not spacelink itself */
 static void buttons_free(SpaceLink *sl)
 {	
-	SpaceButs *sbuts= (SpaceButs*) sl;
+	SpaceButs *sbuts = (SpaceButs *) sl;
 
 	if (sbuts->path)
 		MEM_freeN(sbuts->path);
 	
 	if (sbuts->texuser) {
-		ButsContextTexture *ct= sbuts->texuser;
+		ButsContextTexture *ct = sbuts->texuser;
 		BLI_freelistN(&ct->users);
 		MEM_freeN(ct);
 	}
@@ -110,24 +110,24 @@ static void buttons_free(SpaceLink *sl)
 /* spacetype; init callback */
 static void buttons_init(struct wmWindowManager *UNUSED(wm), ScrArea *sa)
 {
-	SpaceButs *sbuts= sa->spacedata.first;
+	SpaceButs *sbuts = sa->spacedata.first;
 
 	/* auto-align based on size */
 	if (sbuts->align == BUT_AUTO || !sbuts->align) {
 		if (sa->winx > sa->winy)
-			sbuts->align= BUT_HORIZONTAL;
+			sbuts->align = BUT_HORIZONTAL;
 		else
-			sbuts->align= BUT_VERTICAL;
+			sbuts->align = BUT_VERTICAL;
 	}
 }
 
 static SpaceLink *buttons_duplicate(SpaceLink *sl)
 {
-	SpaceButs *sbutsn= MEM_dupallocN(sl);
+	SpaceButs *sbutsn = MEM_dupallocN(sl);
 	
 	/* clear or remove stuff from old */
-	sbutsn->path= NULL;
-	sbutsn->texuser= NULL;
+	sbutsn->path = NULL;
+	sbutsn->texuser = NULL;
 	
 	return (SpaceLink *)sbutsn;
 }
@@ -146,8 +146,8 @@ static void buttons_main_area_init(wmWindowManager *wm, ARegion *ar)
 static void buttons_main_area_draw(const bContext *C, ARegion *ar)
 {
 	/* draw entirely, view changes should be handled here */
-	SpaceButs *sbuts= CTX_wm_space_buts(C);
-	int vertical= (sbuts->align == BUT_VERTICAL);
+	SpaceButs *sbuts = CTX_wm_space_buts(C);
+	int vertical = (sbuts->align == BUT_VERTICAL);
 
 	buttons_context_compute(C, sbuts);
 
@@ -178,8 +178,8 @@ static void buttons_main_area_draw(const bContext *C, ARegion *ar)
 	else if (sbuts->mainb == BCONTEXT_BONE_CONSTRAINT)
 		ED_region_panels(C, ar, vertical, "bone_constraint", sbuts->mainb);
 
-	sbuts->re_align= 0;
-	sbuts->mainbo= sbuts->mainb;
+	sbuts->re_align = 0;
+	sbuts->mainbo = sbuts->mainb;
 }
 
 static void buttons_operatortypes(void)
@@ -205,7 +205,7 @@ static void buttons_header_area_init(wmWindowManager *UNUSED(wm), ARegion *ar)
 static void buttons_header_area_draw(const bContext *C, ARegion *ar)
 {
 	/* clear */
-	UI_ThemeClearColor(ED_screen_area_active(C)?TH_HEADER:TH_HEADERDESEL);
+	UI_ThemeClearColor(ED_screen_area_active(C) ? TH_HEADER : TH_HEADERDESEL);
 	glClear(GL_COLOR_BUFFER_BIT);
 	
 	/* set view2d view matrix for scrolling (without scrollers) */
@@ -221,7 +221,7 @@ static void buttons_header_area_draw(const bContext *C, ARegion *ar)
  * showing that button set, to reduce unnecessary drawing. */
 static void buttons_area_redraw(ScrArea *sa, short buttons)
 {
-	SpaceButs *sbuts= sa->spacedata.first;
+	SpaceButs *sbuts = sa->spacedata.first;
 	
 	/* if the area's current button set is equal to the one to redraw */
 	if (sbuts->mainb == buttons)
@@ -231,7 +231,7 @@ static void buttons_area_redraw(ScrArea *sa, short buttons)
 /* reused! */
 static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
 {
-	SpaceButs *sbuts= sa->spacedata.first;
+	SpaceButs *sbuts = sa->spacedata.first;
 
 	/* context changes */
 	switch (wmn->category) {
@@ -243,11 +243,11 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
 				case ND_FRAME:
 					/* any buttons area can have animated properties so redraw all */
 					ED_area_tag_redraw(sa);
-					sbuts->preview= 1;
+					sbuts->preview = 1;
 					break;
 				case ND_OB_ACTIVE:
 					ED_area_tag_redraw(sa);
-					sbuts->preview= 1;
+					sbuts->preview = 1;
 					break;
 				case ND_KEYINGSET:
 					buttons_area_redraw(sa, BCONTEXT_SCENE);
@@ -265,7 +265,7 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
 			switch (wmn->data) {
 				case ND_TRANSFORM:
 					buttons_area_redraw(sa, BCONTEXT_OBJECT);
-					buttons_area_redraw(sa, BCONTEXT_DATA);	/* autotexpace flag */
+					buttons_area_redraw(sa, BCONTEXT_DATA); /* autotexpace flag */
 					break;
 				case ND_POSE:
 					buttons_area_redraw(sa, BCONTEXT_DATA);
@@ -280,7 +280,7 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
 						ED_area_tag_redraw(sa);
 					else
 						buttons_area_redraw(sa, BCONTEXT_MODIFIER);
-						buttons_area_redraw(sa, BCONTEXT_PHYSICS);
+					buttons_area_redraw(sa, BCONTEXT_PHYSICS);
 					break;
 				case ND_CONSTRAINT:
 					buttons_area_redraw(sa, BCONTEXT_CONSTRAINT);
@@ -289,7 +289,7 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
 				case ND_PARTICLE:
 					if (wmn->action == NA_EDITED)
 						buttons_area_redraw(sa, BCONTEXT_PARTICLE);
-					sbuts->preview= 1;
+					sbuts->preview = 1;
 					break;
 				case ND_DRAW:
 					buttons_area_redraw(sa, BCONTEXT_OBJECT);
@@ -298,7 +298,7 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
 				case ND_SHADING:
 				case ND_SHADING_DRAW:
 					/* currently works by redraws... if preview is set, it (re)starts job */
-					sbuts->preview= 1;
+					sbuts->preview = 1;
 					break;
 				default:
 					/* Not all object RNA props have a ND_ notifier (yet) */
@@ -321,17 +321,17 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
 				case ND_SHADING_DRAW:
 				case ND_NODES:
 					/* currently works by redraws... if preview is set, it (re)starts job */
-					sbuts->preview= 1;
+					sbuts->preview = 1;
 					break;
 			}					
 			break;
 		case NC_WORLD:
 			buttons_area_redraw(sa, BCONTEXT_WORLD);
-			sbuts->preview= 1;
+			sbuts->preview = 1;
 			break;
 		case NC_LAMP:
 			buttons_area_redraw(sa, BCONTEXT_DATA);
-			sbuts->preview= 1;
+			sbuts->preview = 1;
 			break;
 		case NC_BRUSH:
 			buttons_area_redraw(sa, BCONTEXT_TEXTURE);
@@ -339,7 +339,7 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
 		case NC_TEXTURE:
 		case NC_IMAGE:
 			ED_area_tag_redraw(sa);
-			sbuts->preview= 1;
+			sbuts->preview = 1;
 			break;
 		case NC_SPACE:
 			if (wmn->data == ND_SPACE_PROPERTIES)
@@ -358,17 +358,17 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
 			}
 			break;
 		case NC_NODE:
-			if (wmn->action==NA_SELECTED) {
+			if (wmn->action == NA_SELECTED) {
 				ED_area_tag_redraw(sa);
 				/* new active node, update texture preview */
 				if (sbuts->mainb == BCONTEXT_TEXTURE)
-					sbuts->preview= 1;
+					sbuts->preview = 1;
 			}
 			break;
 		/* Listener for preview render, when doing an global undo. */
 		case NC_WINDOW:
 			ED_area_tag_redraw(sa);
-			sbuts->preview= 1;
+			sbuts->preview = 1;
 			break;
 		case NC_LINESTYLE:
 			ED_area_tag_redraw(sa);
@@ -383,39 +383,39 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
 /* only called once, from space/spacetypes.c */
 void ED_spacetype_buttons(void)
 {
-	SpaceType *st= MEM_callocN(sizeof(SpaceType), "spacetype buttons");
+	SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype buttons");
 	ARegionType *art;
 	
-	st->spaceid= SPACE_BUTS;
+	st->spaceid = SPACE_BUTS;
 	strncpy(st->name, "Buttons", BKE_ST_MAXNAME);
 	
-	st->new= buttons_new;
-	st->free= buttons_free;
-	st->init= buttons_init;
-	st->duplicate= buttons_duplicate;
-	st->operatortypes= buttons_operatortypes;
-	st->keymap= buttons_keymap;
-	st->listener= buttons_area_listener;
-	st->context= buttons_context;
+	st->new = buttons_new;
+	st->free = buttons_free;
+	st->init = buttons_init;
+	st->duplicate = buttons_duplicate;
+	st->operatortypes = buttons_operatortypes;
+	st->keymap = buttons_keymap;
+	st->listener = buttons_area_listener;
+	st->context = buttons_context;
 	
 	/* regions: main window */
-	art= MEM_callocN(sizeof(ARegionType), "spacetype buttons region");
+	art = MEM_callocN(sizeof(ARegionType), "spacetype buttons region");
 	art->regionid = RGN_TYPE_WINDOW;
-	art->init= buttons_main_area_init;
-	art->draw= buttons_main_area_draw;
-	art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_FRAMES;
+	art->init = buttons_main_area_init;
+	art->draw = buttons_main_area_draw;
+	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES;
 	BLI_addhead(&st->regiontypes, art);
 
 	buttons_context_register(art);
 	
 	/* regions: header */
-	art= MEM_callocN(sizeof(ARegionType), "spacetype buttons region");
+	art = MEM_callocN(sizeof(ARegionType), "spacetype buttons region");
 	art->regionid = RGN_TYPE_HEADER;
-	art->prefsizey= HEADERY;
-	art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D|ED_KEYMAP_FRAMES|ED_KEYMAP_HEADER;
+	art->prefsizey = HEADERY;
+	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_HEADER;
 	
-	art->init= buttons_header_area_init;
-	art->draw= buttons_header_area_draw;
+	art->init = buttons_header_area_init;
+	art->draw = buttons_header_area_draw;
 	BLI_addhead(&st->regiontypes, art);
 
 	BKE_spacetype_register(st);