[Bf-blender-cvs] [bf7e9f66912] filebrowser_redesign: Merge 'master' into 'filebrowser_redesign'
Julian Eisel
noreply at git.blender.org
Wed Apr 24 15:16:46 CEST 2019
Commit: bf7e9f6691265bb8d9d3dad2fa2f013baaf195a7
Author: Julian Eisel
Date: Fri Apr 19 22:11:20 2019 +0200
Branches: filebrowser_redesign
https://developer.blender.org/rBbf7e9f6691265bb8d9d3dad2fa2f013baaf195a7
Merge 'master' into 'filebrowser_redesign'
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_blender_version.h
index 4c88410134c,7d9fa2d428f..e2594832725
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@@ -20,12 -20,15 +20,15 @@@
* \ingroup bke
*/
- /* these lines are grep'd, watch out for our not-so-awesome regex
- * and keep comment above the defines.
- * Use STRINGIFY() rather than defining with quotes */
+ /**
+ * The lines below use regex from scripts to extract their values,
+ * Keep this in mind when modifying this file and keep this comment above the defines.
+ *
+ * \note Use #STRINGIFY() rather than defining with quotes.
+ */
#define BLENDER_VERSION 280
- #define BLENDER_SUBVERSION 54
- /* Several breakages with 280, e.g. collections vs layers */
-#define BLENDER_SUBVERSION 57
++#define BLENDER_SUBVERSION 58
+ /** Several breakages with 280, e.g. collections vs layers. */
#define BLENDER_MINVERSION 280
#define BLENDER_MINSUBVERSION 0
More information about the Bf-blender-cvs
mailing list