Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-07-24Merge branch 'master' into asset-engineBastien Montagne
Conflicts: source/blender/windowmanager/intern/wm_files_link.c
2016-07-21Cleanup: warningsCampbell Barton
2016-07-18CMake: correct py-module on OSXCampbell Barton
2016-07-16Merge branch 'master' into asset-engineBastien Montagne
Conflicts: source/blender/windowmanager/intern/wm_init_exit.c
2016-07-14Make --debug-all include --debug-cycles and --debug-libmvSergey Sharybin
2016-07-14CMake: per-target CFLAG & CXXFLAG supportCampbell Barton
Applying cflags globally can be problematic especially with extern, intern libs. Now flags from target named will be used when defined, allowing for developers to define flags for modules they maintain. Convention is CMAKE_CFLAGS_${UPPERCASE_TARGET_NAME}, (CXXFLAGS for C++). eg: CMAKE_CFLAGS_BF_BLENDER, CMAKE_CFLAGS_MAKESDNA, CMAKE_CXXFLAGS_CYCLES_KERNEL On Linux run `make help` for full list of names, MSVC shows these in the solution.
2016-07-12writefile: reuse SDNA between writesCampbell Barton
Avoids decoding the SDNA string every undo step.
2016-07-02Merge branch 'master' into asset-engineBastien Montagne
2016-06-30CMake: list buildinfo.h as buildinfo.cmake's outputCampbell Barton
Keep the fake header to ensure we always run.
2016-06-29Cleanup: rename BKE_asset to BKE_asset_engine.Bastien Montagne
Since this file mostly defines/handles interactions with asset engines... Asset handling itself is more done in library area (will split it too in next commit).
2016-06-27Merge branch 'master' into asset-experimentsBastien Montagne
Conflicts: source/blender/blenkernel/BKE_library.h source/blender/blenkernel/intern/brush.c source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/library_remap.c source/blender/blenkernel/intern/mesh.c source/blender/blenloader/BLO_readfile.h source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/writefile.c source/blender/editors/space_action/space_action.c source/blender/editors/space_clip/space_clip.c source/blender/editors/space_file/filelist.c source/blender/editors/space_graph/space_graph.c source/blender/editors/space_image/space_image.c source/blender/editors/space_logic/space_logic.c source/blender/editors/space_nla/space_nla.c source/blender/editors/space_node/space_node.c source/blender/editors/space_outliner/outliner_edit.c source/blender/editors/space_sequencer/space_sequencer.c source/blender/editors/space_text/space_text.c source/blender/editors/space_view3d/space_view3d.c source/blender/makesrna/intern/rna_ID.c source/blender/makesrna/intern/rna_main_api.c source/blender/windowmanager/intern/wm_files_link.c source/blender/windowmanager/wm_files.h
2016-06-25CMake: exclude gitignore & arcconfig for addonsCampbell Barton
These files were included in releases
2016-06-25Exclude obsolete static pythonlibs from installJens Verwiebe
2016-06-24Avoid memory leaks on exit during argument parsingCampbell Barton
Exiting Blender during argument parsing would leak memory (tests, documentation generation, utilities). While harmless, it hides real leaks which should be resolved.
2016-06-13Merge branch 'master' into asset-experimentsBastien Montagne
2016-06-07GPU: make using the glsl basic-shader a flagCampbell Barton
This allows for it to be more easily tested.
2016-06-07Merge branch 'id-remap' into asset-experimentsBastien Montagne
Conflicts: source/blender/makesdna/DNA_ID.h
2016-06-04CMake, minor changes to make Visual studio 2015 use a compatible numpy andMartijn Berger
the standard cmake CUDA/NVCC arguments flag allowing 2015 build to use msvc 2013 for cuda
2016-06-02Minor changes to help textCampbell Barton
D2040 by @Blendify, also move 'Experimental Features' above more general help text.
2016-05-24Merge branch 'master' into asset-experimentsBastien Montagne
2016-05-18Cleanup: cmake, indentation, line lengthCampbell Barton
2016-05-11Cleanup: unused win32 headersCampbell Barton
2016-05-10CMake: optional date/time overrides for reproducible buildsCampbell Barton
2016-05-02Merge branch 'master' into asset-experimentsBastien Montagne
2016-04-28Python: install pyconfig.h on OSX, needed for PIPCampbell Barton
2016-04-25Merge branch 'master' into asset-engineBastien Montagne
Conflicts: source/blender/blenkernel/intern/blender.c source/blender/windowmanager/intern/wm_files.c source/blender/windowmanager/intern/wm_init_exit.c
2016-04-25Refactor BKE_blender into separate headersCampbell Barton
- BKE_blender_version.h (only version defines & versionstr). - BKE_blender_copybuffer.h (currently only used for view3d copy/paste). - BKE_blender_undo.h (global undo functions). - BKE_blendfile.h (high level blend file read/write API).
2016-04-16Merge branch 'master' into asset-engineBastien Montagne
2016-04-12Missed last commitCampbell Barton
2016-04-06Merge branch 'master' into asset-engineBastien Montagne
2016-04-06Correct error checking for wrong frame rangeCampbell Barton
2016-04-06Cleanup: arg docstringsCampbell Barton
2016-04-06Render frame arg parsing, list and range supportCampbell Barton
Support a comma separated list of frames, as well as frame ranges using the '..' separator. eg: `blender my.blend --render-frame 1,2,10..40,100..200`
2016-04-04Merge branch 'master' into asset-engineBastien Montagne
2016-03-31Remove the obsolete windows launcherMartijn Berger
2016-03-31CMAKE disable building the windows launcher, fix type in delayloading of ↵Martijn Berger
debug dll
2016-03-31CMAKE / msvc openmp, delay loading of openmp dll so we can set environmentMartijn Berger
variable before it is loaded
2016-03-30Merge branch 'master' into asset-engineBastien Montagne
Conflicts: source/blender/blenkernel/intern/library_query.c
2016-03-29Add license text for OCIO configurationSergey Sharybin
2016-03-17Merge branch 'master' into asset-engineBastien Montagne
Conflicts: source/blender/blenkernel/intern/blender.c
2016-03-11Include requests' cacert.pem fileSybren A. Stüvel
This allows us to verify certificates of HTTPS connections, which is mandatory for logins like on Blender ID. Reviewers: campbellbarton Differential Revision: https://developer.blender.org/D1845
2016-03-09More WIP work towards designing Updated feature for assets/engines.Bastien Montagne
2016-03-04Merge branch 'master' into asset-engineBastien Montagne
2016-03-03Correct image format args (remove 'MOVIE')Campbell Barton
2016-03-03Cleanup: comments for creator_args & line lengthCampbell Barton
2016-03-02Cleanup: style, and --help editsCampbell Barton
2016-02-29Include modules needed for Python to run pipCampbell Barton
This means Python developers can install pip using Blender's bundled Python.
2016-02-29Merge branch 'master' into asset-engineBastien Montagne
2016-02-27Cleanup split creator.cCampbell Barton
creator.c was getting hard to follow. - Split off argument and signal handling into own files. - Move docstrings next to functions (to keep docs grouped with code).
2016-02-19Merge branch 'master' into asset-engineBastien Montagne