griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
146,530 Commits 1 Branch 0 Tags
8fed30aff22a725eaf94de9645d041bf8093a53e
Commit Graph

2988 Commits

Author SHA1 Message Date
Campbell Barton
32cf7fcdb1 code cleanup: spelling 2012-07-16 23:23:33 +00:00
Tamito Kajiyama
065605e0da Merged changes in the trunk up to revision 48893. 
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/makesrna/RNA_enum_types.h
 2012-07-13 23:23:06 +00:00
Campbell Barton
b91bc4f037 use gcc attrubutes to warn on unused return values and arguments which shouldnt be NULL. 
also remove IDP_AppendArray's return value which wasnt the new item in the array (which is odd/misleading), but wasnt used anywhere either.
 2012-07-08 06:00:27 +00:00
Campbell Barton
cfb7aee017 style cleanup 2012-07-07 22:51:57 +00:00
Campbell Barton
84bf3e48c0 style cleanup: use c style comments in C code 2012-07-06 23:56:59 +00:00
Tamito Kajiyama
b7b5029814 Merged changes in the trunk up to revision 48695. 2012-07-06 23:46:48 +00:00
Campbell Barton
314a275850 fix (actually nasty workaround), for groups incorrectly drawing in the object panel when the blend file has naming collisions with library data. 
also minor style cleanup in bpy_rna.c
 2012-07-03 10:32:10 +00:00
Tamito Kajiyama
98a7ca61fa Merged changes in the trunk up to revision 48505. 2012-07-03 00:02:45 +00:00
Campbell Barton
a09feb7386 option so operators can be executed with undo enabled (and redo). 2012-06-27 21:41:17 +00:00
Campbell Barton
15cb064e1b style cleanup 2012-06-25 07:24:48 +00:00
Tamito Kajiyama
8135cc9f95 Merged changes in the trunk up to revision 47700. 
Conflicts resolved:
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/WM_types.h
 2012-06-10 20:50:43 +00:00
Campbell Barton
f6e21881f5 change RNA_struct_find_function to accept a type rather then a PointerRNA, add a check duplicate functions are not defined. 2012-06-10 13:34:59 +00:00
Campbell Barton
2f60d9b0b9 fix for un-handled exception when entering in multiple values to a button, floats were not correctly checked for. 2012-06-09 16:45:42 +00:00
Campbell Barton
ed7dbbdfe9 fix for buffer overrun on windows by kjym3 on IRC. 2012-06-07 09:05:51 +00:00
Campbell Barton
1931aac1f7 style cleanup: (indentation) 2012-06-06 14:48:39 +00:00
Campbell Barton
5189356d58 style cleanup 2012-06-04 20:11:09 +00:00
Tamito Kajiyama
329b05dcd7 Merged changes in the trunk up to revision 47381. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
 2012-06-03 21:11:10 +00:00
Campbell Barton
46f1671c07 missing from previous commit 2012-05-27 21:56:19 +00:00
Campbell Barton
032d83ecc4 style cleanup: defines with braces 2012-05-27 20:13:59 +00:00
Tamito Kajiyama
b6a9a953bc Merged changes in the trunk up to revision 47056. 
Conflicts resolved:
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/convertblender.c
 2012-05-26 22:22:45 +00:00
Gaia Clary
352cd241a3 fix [#31597] Operator Preset: Python Warning whenever a preset is executed (seen on Windows) 2012-05-25 14:08:50 +00:00
Campbell Barton
dab1d8e487 style cleanup 2012-05-22 22:03:41 +00:00
Campbell Barton
3896ad4cbb code cleanup: spelling 2012-05-20 21:23:26 +00:00
Campbell Barton
2d2d36fe3b code cleanup: 
- style - multi-line ifs move braces onto new lines.
- iterators - convert some to macros, other split up and move brace.
 2012-05-20 19:49:27 +00:00
Dan Eicher
dd7229aee0 Added 'LIBRARY_EDITABLE' flag to bpy.props.* 
Rationale: custom props on linked objects are editable through ops and the console but the UI code calls RNA_property_editable() which returns false if (id->lib && !(prop->flag & PROP_LIB_EXCEPTION))

Setting the 'LIBRARY_EDITABLE' flag allows UI templates to change these props (but the changes aren't saved!) for things like indices into CollectionProperties which live on the linked object
 2012-05-19 21:22:01 +00:00
Campbell Barton
af3e348430 code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars. 2012-05-19 13:28:19 +00:00
Tamito Kajiyama
a5152b7ca0 Merged changes in the trunk up to revision 46787. 
Conflicts resolved:
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/makesrna/intern/rna_main.c
 2012-05-19 08:40:56 +00:00
Campbell Barton
181f3670c9 patch [#31507] site not automatically imported when using external python package 
made some modificatons to normal python startup also.
 2012-05-18 10:19:49 +00:00
Campbell Barton
c0bd076bfd style cleanup: and add missing files to cmake 2012-05-17 23:12:15 +00:00
Nicholas Bishop
ed33320e3f Code cleanup: simplify standard GHash creation. 
Added four new functions as shortcuts to creating GHashes that use the
standard ptr/str/int/pair hash and compare functions.

GHash *BLI_ghash_ptr_new(const char *info);
GHash *BLI_ghash_str_new(const char *info);
GHash *BLI_ghash_int_new(const char *info);
GHash *BLI_ghash_pair_new(const char *info);

Replaced almost all occurrences of BLI_ghash_new() with one of the
above functions.
 2012-05-16 00:51:36 +00:00
Sergey Sharybin
7b31c3c198 Fix cosmetic typos 
Patch provided by Matteo F. Vescovi, thanks!
 2012-05-15 16:11:04 +00:00
Tamito Kajiyama
8925ed1420 Merged changes in the trunk up to revision 46557. 
Conflicts resolved:
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/makesrna/intern/rna_scene.c

Additional changes:
* Fix for recent changes of BKE_* function renaming.
* Fix for an "attempt to free NULL pointer" in BlenderStrokeRenderer::RenderStrokeRepBasic().
 2012-05-11 22:48:41 +00:00
Campbell Barton
b667f29a84 no need to clamp python values twice when assigning. 2012-05-11 10:25:12 +00:00
Brecht Van Lommel
d9ce1cda94 Python/context: python could get invalid bpy.data in scene update handler after 
undo.

The way this got updated from the context is a bit unreliable, and for handlers
the update couldn't happen because there is no context passed in. Now it's
updated from setup_app_data, which is where the change actually happens. I left
in the other updates to be sure but they should not be needed anymore.
 2012-05-08 22:07:06 +00:00
Tamito Kajiyama
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
Campbell Barton
4c5502bfd6 code cleanup: function naming for BLI functions. 2012-05-05 00:23:55 +00:00
Joshua Leung
133bdac1d0 Patch [#31279] clarifiy a python error-string (when incorrectly specifying enum 
items from python)

Thanks Philipp Oeser (lichtwerk)
 2012-05-04 14:34:10 +00:00
Campbell Barton
9fe1fe0aa8 bmesh py api: 
add mtexpoly image access
 2012-05-01 06:50:43 +00:00
Campbell Barton
a5af5e8f50 style cleanup: re - http://wiki.blender.org/index.php/Dev:Doc/CodeStyle#Braces_with_Macros 2012-04-30 16:22:40 +00:00
Tamito Kajiyama
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
Campbell Barton
ef054e165c style cleanup: format 'for' loop macros the same as for loops, some renaming to BLI_array macros. 2012-04-28 15:14:16 +00:00
Campbell Barton
5c89138684 style cleanup: comments 2012-04-22 11:54:53 +00:00
Campbell Barton
6701933f5c style cleanup 2012-04-21 12:51:47 +00:00
Tamito Kajiyama
cdbfd1db38 Merged changes in the trunk up to revision 45820. 
Conflicts resolved:
source/creator/creator.c
 2012-04-21 00:33:36 +00:00
Campbell Barton
6520aa97a9 add 'idprop' module so we can document idprop.types.*, currently doc generator has no access to ID Property types. 2012-04-15 14:54:15 +00:00
Tamito Kajiyama
4a19ccfa5f Merged changes in the trunk up to revision 45619. 2012-04-14 10:38:11 +00:00
Brecht Van Lommel
440f449265 Fix #30858: UI losing buttons at some random moment after using Blender for a 
while. This may not fix all cases but should at least solve the issue when
rendering with cycles.

The cause was a race condition on C->data.recursion, with multiple threads
accessing context at the same time. Cycles itself does not access context
from the render thread, but the bpy api would do a context update for any
callback in case e.g. a new file got loaded. Disabled that now in non-main
threads.

The ideal solution would be to not allow any context access at all from threads
but that's not so simple to implement, especially not this close to release.
 2012-04-13 16:03:52 +00:00
Campbell Barton
1add07821b fix [#30925] successful import of keyconfig dependant on current object context? 
revert r34885,

The hack was to fix poselib UI but is REALLY BAD - don't modify properties when accessing them.

This bug must be fixed some other way.
 2012-04-13 09:25:50 +00:00
Campbell Barton
9e663017d8 py rna/api: fix for error running RNA_property_collection_type_get on non collection property types. 2012-04-11 10:35:09 +00:00
Brecht Van Lommel
63e2763842 Fix #30698: python console nodetree paths were not accurate, now show ... like 
in some other cases to at least show these are not accurate.
 2012-04-10 16:37:05 +00:00