15ed834343
Merged changes in the trunk up to revision 51718.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_scene.c
release/datafiles/startup.blend
2012-10-29 01:09:12 +00:00
f3ece5a108
style cleanup: trailing tabs & expand some non prefix tabs into spaces.
2012-10-21 05:46:41 +00:00
e91f33101f
Merged changes in the trunk up to revision 50956.
...
Conflicts resolved:
source/blender/editors/interface/resources.c
2012-09-30 13:16:55 +00:00
9fccfd313c
correct addon example, it used both __doc__ and bl_description
2012-09-29 11:51:18 +00:00
a42ba82f63
Merged changes in the trunk up to revision 50829.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material). OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.
2012-09-23 18:50:56 +00:00
e75f5c8208
quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.
...
helps for finding unused functions and making functions static, also did some minor code cleanup.
2012-09-15 01:52:28 +00:00
141dd5233e
Merged changes in the trunk up to revision 50257.
...
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
2012-08-29 00:53:29 +00:00
4a6395cc21
fix for own error in bpy.utils.blend_paths() arg parsing.
2012-08-20 10:14:11 +00:00
bb1f8d9586
Merged changes in the trunk up to revision 46309.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c
2012-05-05 11:40:42 +00:00
4c5502bfd6
code cleanup: function naming for BLI functions.
2012-05-05 00:23:55 +00:00
2585d52405
Merged changes in the trunk up to revision 46045.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h
2012-04-29 00:59:04 +00:00
6701933f5c
style cleanup
2012-04-21 12:51:47 +00:00
4c36a26af5
Merged changes in the trunk up to revision 45308.
...
Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
2012-03-31 22:09:43 +00:00
abf551b1a5
style cleanup: py api
2012-03-26 20:41:54 +00:00
3b711a6ed0
Merged changes in the trunk up to revision 45133.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c
2012-03-25 08:20:19 +00:00
b56d2f9766
fix [ #30623 ] user-defined render presets bug
...
this report exposed multiple bugs in blender when using a non utf8 compatible home directory.
- bpy.utils.script_paths() would crash when homedir wasn't utf8 (reported bug)
- PyC_DefaultNameSpace() - would raise an error when running when __file__ was non utf8.
- preset filepath property was not set to accept non utf8.
- bpy.paths.display_name would raise an error on non utf8 paths, (used for preset draw)
2012-03-21 22:29:49 +00:00
a2ebfc82db
Merged changes in the trunk up to revision 44797.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_mesh.c
2012-03-10 21:56:23 +00:00
3590076193
style cleanup - comment formatting
2012-03-03 20:36:09 +00:00
0896a22723
Merged changes in the trunk up to revision 42902.
...
Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/python/intern/bpy.c
2011-12-27 22:12:46 +00:00
e17fd46c71
formatting edits only to use more consisted style
2011-12-26 12:26:11 +00:00
3197796cf7
Merged changes in the trunk up to revision 42425.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c
2011-12-05 02:12:49 +00:00
d52a811052
minor bpy api edits
...
- strict check for rna properties
- formatting edits (120 line width)
- use PyDoc_STRVAR macros for getset docstrings
2011-11-26 15:18:30 +00:00
2676f2d58f
Merged changes in the trunk up to revision 42021.
...
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/pipeline.c
2011-11-20 21:02:12 +00:00
d4d80ee0a1
rename IDProp.c/h to idprop_py_api, since it was same name as BKE idprop.c with case changed.
2011-11-15 09:28:15 +00:00
80e398e7b2
Merged changes in the trunk up to revision 41638.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
2011-11-08 06:30:02 +00:00
2b939904ab
documentation - brief descriptions for bpy api files.
2011-11-05 08:21:12 +00:00
65668dc5eb
Merged changes in the trunk up to revision 41368.
...
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c
2011-10-30 02:03:40 +00:00
31d401613d
bpath
...
- loop over all sequence images and pointcache
- option not to loop over library / packed data, expose in bpy.utils.blend_paths()
2011-10-27 03:40:12 +00:00
cd852ce1a1
- remove bpath iterator and replace all uses with visitor.
...
- added flag to optionally receive all paths as absolute.
2011-10-27 01:25:07 +00:00
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
b4e7451cb0
Merged changes in the trunk up to revision 41099.
2011-10-18 23:36:43 +00:00
276e5f7095
formatting edits & remove debug print.
2011-10-13 01:29:08 +00:00
ce03ec4b86
Merged changes in the trunk up to revision 38543.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
2011-07-20 23:33:10 +00:00
3a6158a8bf
move mathutils into its own lib.
2011-07-15 04:01:47 +00:00
d65ebf8c84
Merged changes in the trunk up to revision 37799.
...
Note for VS2008 plus CMake users:
I had to remove OpenEXR debug libs from the "blender" project properties >
Linker > Additional Dependencies. Otherwise I got a number of linker errors
concerning duplicated symbols between libcmt.lib and libcmtd.lib.
2011-06-25 00:49:53 +00:00
2023db70a8
cmake option to build without an audio library.
2011-06-23 09:27:56 +00:00
32c7e22d36
Merged changes in the trunk up to revision 37388.
...
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/creator/SConscript
source/blender/blenlib/intern/bpath.c
source/blender/editors/space_outliner/outliner.c
2011-06-11 00:22:10 +00:00
d46da5a09d
mathutils support for color arithmetic, also some minor whitespace edits.
2011-06-02 08:29:16 +00:00
d369a6aaaf
Windows installer and Path changes, fixing various issues:
...
* Windows installer not working for non-admin users and multiple users
* Addon scripts not installing next to user configuration
* Portable install not being taken into account in all places
The main problem was the windows installer was installing system scripts in
AppData next to the user configuration directory, which is not shared between
users. Now these are installed in ProgramFiles, and only addon scripts added
by the users go to AppData.
On all platforms, addon scripts were sometimes getting installed between
system scripts, because the scripts folder in the executable directory was
given precedence over the user configuration folder, that is no longer done
now. So addons now behave like user configuration, they are preserved even
if you download a newer build of the same blender version.
If you have an installation of 2.57 on windows, the addon install location
will not change until we do the version bump to 2.58, to avoid conflicts with
the existing the installed 2.57 version.
The old behavior of giving precedence to the local folder was done to support
portable install, where all configuration is written to the local folder. This
is now implemented differently: if and only if a "config" folder exists in the
local folder, portable install will be assumed, and files will only be written
to that local folder.
2011-05-27 09:57:53 +00:00
15289c6048
use PyDoc_STRVAR macro, so its possible to build without docstrings.
2011-05-24 16:05:51 +00:00
4c37fe91f3
patch [ #27449 ] bpy_script_paths() return path reversed [patch]
...
from Dan Eicher (dna)
2011-05-21 05:34:20 +00:00
bd860f89e7
Merged changes in the trunk up to revision 36301.
2011-04-23 22:08:18 +00:00
210ee1ade4
whitespace only, no functional change mixed tabs/spaces --> tabs.
2011-04-21 13:11:51 +00:00
7e3d044bdd
fix [ #27072 ] Calling bpy.utils.blend_paths(True) results in segmantaion fault since 2.56
2011-04-20 12:55:42 +00:00
2497af95a1
Merged changes in the trunk up to revision 36199.
2011-04-17 14:20:43 +00:00
f8c09b37d4
api changes needed for for copying old settings to new.
...
- py: bpy.utils.resource_path('USER', 2, 56)
- C: BLI_get_folder_version(id, major, minor, check);
2011-04-11 13:56:58 +00:00
3df52d4e19
Merged changes in the trunk up to revision 36092.
...
Conflicts resolved:
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
2011-04-11 00:09:56 +00:00
696e7a311a
include needed for windows
2011-04-06 06:29:10 +00:00
a7507e945d
fix [ #26803 ] Libs paths are case sensitive in windows
...
use case insensitive path comparison on windows: BLI_path_cmp
2011-04-06 06:03:48 +00:00
040f0a1096
Merged changes in the trunk up to revision 35828.
...
Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h
According to the changes in revision 35667, the Freestyle-related code
in release/scripts/ui/ was moved to release/scripts/startup/bl_ui/.
2011-03-27 23:11:22 +00:00
