[Bf-blender-cvs] [71eaebd79c7] temp-clang-format: Merge branch 'master' into temp-clang-format
Campbell Barton
noreply at git.blender.org
Fri Apr 12 12:53:04 CEST 2019
Commit: 71eaebd79c73c668618783fb3f7e59c3f364609f
Author: Campbell Barton
Date: Fri Apr 12 20:48:55 2019 +1000
Branches: temp-clang-format
https://developer.blender.org/rB71eaebd79c73c668618783fb3f7e59c3f364609f
Merge branch 'master' into temp-clang-format
===================================================================
===================================================================
diff --cc GNUmakefile
index 261dfaa63bf,35960733858..8c70e187f11
--- a/GNUmakefile
+++ b/GNUmakefile
@@@ -24,6 -24,128 +24,131 @@@
# ../build_linux_i386
# This is for users who like to configure & build blender with a single command.
+ define HELP_TEXT
+
+ Convenience Targets
+ Provided for building Blender, (multiple at once can be used).
+
+ * debug: Build a debug binary.
+ * full: Enable all supported dependencies & options.
+ * lite: Disable non essential features for a smaller binary and faster build.
+ * headless: Build without an interface (renderfarm or server automation).
+ * cycles: Build Cycles standalone only, without Blender.
+ * bpy: Build as a python module which can be loaded from python directly.
+ * deps: Build library dependencies (intended only for platform maintainers).
+
+ * config: Run cmake configuration tool to set build options.
+
+ Note: passing the argument 'BUILD_DIR=path' when calling make will override the default build dir.
+ Note: passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments.
+
+
+ Project Files
+ Generate poject files for development environments.
+
+ * project_qtcreator: QtCreator Project Files.
+ * project_netbeans: NetBeans Project Files.
+ * project_eclipse: Eclipse CDT4 Project Files.
+
+ Package Targets
+
+ * package_debian: Build a debian package.
+ * package_pacman: Build an arch linux pacman package.
+ * package_archive: Build an archive package.
+
+ Testing Targets
+ Not associated with building Blender.
+
+ * test:
+ Run ctest, currently tests import/export,
+ operator execution and that python modules load
+ * test_cmake:
+ Runs our own cmake file checker
+ which detects errors in the cmake file list definitions
+ * test_pep8:
+ Checks all python script are pep8
+ which are tagged to use the stricter formatting
+ * test_deprecated:
+ Checks for deprecation tags in our code which may need to be removed
+ * test_style_c:
+ Checks C/C++ conforms with blenders style guide:
+ https://wiki.blender.org/wiki/Source/Code_Style
+ * test_style_c_qtc:
+ Same as test_style but outputs QtCreator tasks format
+ * test_style_osl:
+ Checks OpenShadingLanguage conforms with blenders style guide:
+ https://wiki.blender.org/wiki/Source/Code_Style
+ * test_style_osl_qtc:
+ Checks OpenShadingLanguage conforms with blenders style guide:
+ https://wiki.blender.org/wiki/Source/Code_Style
+
+ Static Source Code Checking
+ Not associated with building Blender.
+
+ * check_cppcheck: Run blender source through cppcheck (C & C++).
+ * check_clang_array: Run blender source through clang array checking script (C & C++).
+ * check_splint: Run blenders source through splint (C only).
+ * check_sparse: Run blenders source through sparse (C only).
+ * check_smatch: Run blenders source through smatch (C only).
+ * check_spelling_c: Check for spelling errors (C/C++ only).
+ * check_spelling_c_qtc: Same as check_spelling_c but outputs QtCreator tasks format.
+ * check_spelling_osl: Check for spelling errors (OSL only).
+ * check_spelling_py: Check for spelling errors (Python only).
+ * check_descriptions: Check for duplicate/invalid descriptions.
+
+ Utilities
+ Not associated with building Blender.
+
+ * icons:
+ Updates PNG icons from SVG files.
+
+ Optionally pass in variables: 'BLENDER_BIN', 'INKSCAPE_BIN'
+ otherwise default paths are used.
+
+ Example
+ make icons INKSCAPE_BIN=/path/to/inkscape
+
+ * icons_geom:
+ Updates Geometry icons from BLEND file.
+
+ Optionally pass in variable: 'BLENDER_BIN'
+ otherwise default paths are used.
+
+ Example
+ make icons_geom BLENDER_BIN=/path/to/blender
+
+ * tgz:
+ Create a compressed archive of the source code.
+
+ * update:
+ updates git and all submodules
+
++ * format
++ Format source code using clang (uses PATHS if passed in).
++
+ Environment Variables
+
+ * BUILD_CMAKE_ARGS: Arguments passed to CMake.
+ * BUILD_DIR: Override default build path.
+ * PYTHON: Use this for the Python command (used for checking tools).
+ * NPROCS: Number of processes to use building (auto-detect when omitted).
+
+ Documentation Targets
+ Not associated with building Blender.
+
+ * doc_py: Generate sphinx python api docs.
+ * doc_doxy: Generate doxygen C/C++ docs.
+ * doc_dna: Generate blender file format reference.
+ * doc_man: Generate manpage.
+
+ Information
+
+ * help: This help message.
+ * help_features: Show a list of optional features when building.
+
+ endef
+ # HELP_TEXT (end)
+
# System Vars
OS:=$(shell uname -s)
diff --cc source/blender/blenkernel/intern/unit.c
index 6d8b572cd09,2d2db5fea1e..c14b9e04c33
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@@ -311,13 -318,13 +326,13 @@@ static struct bUnitCollection buPowerCo
#define UNIT_SYSTEM_TOT (((sizeof(bUnitSystems) / B_UNIT_TYPE_TOT) / sizeof(void *)) - 1)
static const struct bUnitCollection *bUnitSystems[][B_UNIT_TYPE_TOT] = {
- {NULL, NULL, NULL, NULL, NULL, &buNaturalRotCollection, &buNaturalTimeCollection, NULL, NULL, NULL},
- {NULL, &buMetricLenCollection, &buMetricAreaCollection, &buMetricVolCollection, &buMetricMassCollection, &buNaturalRotCollection, &buNaturalTimeCollection, &buMetricVelCollection, &buMetricAclCollection, &buCameraLenCollection}, /* metric */
- {NULL, &buImperialLenCollection, &buImperialAreaCollection, &buImperialVolCollection, &buImperialMassCollection, &buNaturalRotCollection, &buNaturalTimeCollection, &buImperialVelCollection, &buImperialAclCollection, &buCameraLenCollection}, /* imperial */
- {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+ {NULL, NULL, NULL, NULL, NULL, &buNaturalRotCollection, &buNaturalTimeCollection, NULL, NULL, NULL, NULL},
+ {NULL, &buMetricLenCollection, &buMetricAreaCollection, &buMetricVolCollection, &buMetricMassCollection, &buNaturalRotCollection, &buNaturalTimeCollection, &buMetricVelCollection, &buMetricAclCollection, &buCameraLenCollection, &buPowerCollection}, /* metric */
+ {NULL, &buImperialLenCollection, &buImperialAreaCollection, &buImperialVolCollection, &buImperialMassCollection, &buNaturalRotCollection, &buNaturalTimeCollection, &buImperialVelCollection, &buImperialAclCollection, &buCameraLenCollection, &buPowerCollection}, /* imperial */
+ {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
};
-
+/* clang-format off */
/* internal, has some option not exposed */
static const bUnitCollection *unit_get_system(int system, int type)
diff --cc source/blender/blenlib/BLI_utildefines_variadic.h
index 9e7f2d00168,3048b814383..658733c80dc
--- a/source/blender/blenlib/BLI_utildefines_variadic.h
+++ b/source/blender/blenlib/BLI_utildefines_variadic.h
@@@ -17,13 -17,10 +17,13 @@@
#ifndef __BLI_UTILDEFINES_VARIADIC_H__
#define __BLI_UTILDEFINES_VARIADIC_H__
- /** \file BLI_utildefines_variadic.h
- * \ingroup bli
+ /** \file
+ * \ingroup bli
*/
+/* Over wrapped args. */
+/* clang-format off */
+
/* --- internal helpers --- */
#define _VA_NARGS_GLUE(x, y) x y
#define _VA_NARGS_RETURN_COUNT(\
More information about the Bf-blender-cvs
mailing list