griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
41,656 Commits 1 Branch 0 Tags
a42ba82f638e481d7fd3c3ed2ba05c331ef6717e
Commit Graph

1256 Commits

Author SHA1 Message Date
Tamito Kajiyama
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
Campbell Barton
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
Tamito Kajiyama
4172997675 Merged changes in the trunk up to revision 50607. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
 2012-09-15 00:15:24 +00:00
Campbell Barton
cf5da37e3c fix for a bug running a script, then opening a new file. 
BPY_text_free_code() could run outside the python interpreter which abort()'s blender.
 2012-09-10 23:32:46 +00:00
Campbell Barton
e2eea6c38d fix/workaround [#31555] Username with special chars in Windows 7 
Theres a bug where python/windows ignores PYTHONIOENCODING, workaround this by manually overriding the stdout/stderr.
 2012-09-05 09:33:15 +00:00
Tamito Kajiyama
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
Campbell Barton
71d1b09708 minor code cleanup 2012-08-25 12:55:14 +00:00
Campbell Barton
1939baa47d style cleanup 2012-08-22 16:44:32 +00:00
Campbell Barton
4a6395cc21 fix for own error in bpy.utils.blend_paths() arg parsing. 2012-08-20 10:14:11 +00:00
Tamito Kajiyama
44e4c5f831 Merged changes in the trunk up to revision 49797. 2012-08-12 00:09:57 +00:00
Campbell Barton
0b5a995cfd code cleanup: rename G.rt to G.debug_value 2012-08-08 18:21:54 +00:00
Campbell Barton
e9d73dbba5 use -FLT_MAX where FLT_MIN was misused 2012-08-07 19:49:38 +00:00
Campbell Barton
719aedaf60 mask - draw both sides of the curve when filled option is disabled. 2012-08-07 13:37:16 +00:00
Campbell Barton
b218d90176 fix a crash when python is registering enum properties and the items argument is a generator (some sequence type besides a list/typle), in this case it could free the strings before blender duplicates them. 
this fixes [#32192] Import Images as Planes script is broken
 2012-08-07 10:03:14 +00:00
Campbell Barton
0a35e050f3 code cleanup: remove redundant calls to CTX_data_main() 2012-08-05 14:11:51 +00:00
Tamito Kajiyama
4ea2fb8b0a Merged changes in the trunk up to revision 49478. 
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
 2012-08-02 00:10:05 +00:00
Lukas Toenne
dee1d86e65 Fix for RNA struct registration: the bpy_class_validate function would only check the immediate functions/properties of the pointer struct type, but not potential base structs. Now it first validates the base struct recursively before the actual properties of the registered class. 
Does not have any effect for current registerable types (Operator, Menu, Panel, etc.), since none of those actually have a base struct, but will be required for future types with an actual hierarchy (custom nodes).
 2012-07-24 12:00:02 +00:00
Tamito Kajiyama
3b012c041f Merged changes in the trunk up to revision 49090. 2012-07-20 23:12:05 +00:00
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