[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60011] trunk/blender/source/blender: Fix #36271: missing (+) icon for toolbar in compositing layout in default startup.blend.

Brecht Van Lommel brechtvanlommel at pandora.be
Tue Sep 10 15:25:39 CEST 2013


Revision: 60011
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60011
Author:   blendix
Date:     2013-09-10 13:25:39 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
Fix #36271: missing (+) icon for toolbar in compositing layout in default startup.blend.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_blender.h
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h	2013-09-10 13:25:37 UTC (rev 60010)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h	2013-09-10 13:25:39 UTC (rev 60011)
@@ -42,7 +42,7 @@
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION         268
-#define BLENDER_SUBVERSION      4
+#define BLENDER_SUBVERSION      5
 /* 262 was the last editmesh release but it has compatibility code for bmesh data */
 #define BLENDER_MINVERSION      262
 #define BLENDER_MINSUBVERSION   0

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2013-09-10 13:25:37 UTC (rev 60010)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2013-09-10 13:25:39 UTC (rev 60011)
@@ -9653,6 +9653,40 @@
 		}
 	}
 
+	if (!MAIN_VERSION_ATLEAST(main, 268, 5)) {
+		bScreen *sc;
+		ScrArea *sa;
+
+		/* add missing (+) expander in node editor */
+		for (sc = main->screen.first; sc; sc = sc->id.next) {
+			for (sa = sc->areabase.first; sa; sa = sa->next) {
+				ARegion *ar, *arnew;
+
+				if (sa->spacetype == SPACE_NODE) {
+					ar = BKE_area_find_region_type(sa, RGN_TYPE_TOOLS);
+
+					if (ar)
+						continue;
+
+					/* add subdiv level; after header */
+					ar = BKE_area_find_region_type(sa, RGN_TYPE_HEADER);
+					
+					/* is error! */
+					if (ar == NULL)
+						continue;
+
+					arnew = MEM_callocN(sizeof(ARegion), "node tools");
+					
+					BLI_insertlinkafter(&sa->regionbase, ar, arnew);
+					arnew->regiontype = RGN_TYPE_TOOLS;
+					arnew->alignment = RGN_ALIGN_LEFT;
+					
+					arnew->flag = RGN_FLAG_HIDDEN;
+				}
+			}
+		}
+	}
+
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
 	/* WATCH IT 2!: Userdef struct init see do_versions_userdef() above! */
 




More information about the Bf-blender-cvs mailing list