griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
66,005 Commits 1 Branch 0 Tags
c50ccc847613bbe02bea64cee3f744b449da170c
Commit Graph

402 Commits

Author SHA1 Message Date
Campbell Barton
cfb7aee017 style cleanup 2012-07-07 22:51:57 +00:00
Tamito Kajiyama
98a7ca61fa Merged changes in the trunk up to revision 48505. 2012-07-03 00:02:45 +00:00
Campbell Barton
32478997ec style cleanup 2012-06-27 18:29:47 +00:00
Tamito Kajiyama
1f7ae143a2 Merged changes in the trunk up to revision 48227. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_file/filelist.c
 2012-06-24 10:29:26 +00:00
Sergey Sharybin
ff998e15a7 Fixes for 8vytes scalar types used in DNA (int64 and double) 
- makesdna wasn't checking whether such scalars are aligned to 8 bytes.
  Now it should be handled correct.
- Some scalars in Object structure weren't 8 bytes aligned, which lead
  to some incorrectly loaded files.

  Fixed by adding void *pad. It's a bit tricky part of patch, but can't
  see clearer way to make alignment correct

  Usually ints/chars were used for padding, but in this case there are
  some leading pointer properties before int64 properties and using
  pointer as a padding resolves alignment on both 32 and 64 bit
  platforms.

  Using pointers as padding weren't needed before, because all types
  were correctly aligned independent of whether pointers are 4 or 8
  bytes.

This fixes #31774: Empty offset Y parameter is resetting
 2012-06-21 10:52:23 +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
68a9dd54ec mask mode for clip editor developed by Sergey Sharybin, Pete Larabell and myself. 
see:
http://wiki.blender.org/index.php/User:Nazg-gul/MaskEditor


note - mask editing tools need continued development, feather option is not working 100%
 2012-06-04 16:42:58 +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
b33f0ef0e3 style cleanup 2012-05-27 19:40:36 +00:00
Campbell Barton
1e45042396 code cleanup: remove mode comments, these were applied very un-evenly across a few files. 2012-05-27 13:22:43 +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
Campbell Barton
57c292daf0 style cleanup 2012-05-25 09:51:53 +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
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
9dd981a440 style cleanup: block comments 2012-05-16 23:37:23 +00:00
Bastien Montagne
2e89e0096a Spell check fix (lenght -> length) 
Note: two remains, in comments in extern/bullet2/src/LinearMath/btVector3.h and extern/libmv/libmv/image/tuple.h.
 2012-05-16 14:25:25 +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
Campbell Barton
2f2b15bbb2 style cleanup: whitespace, bli & makesdna 2012-05-12 15:02:10 +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
Sergey Sharybin
549b3ccba1 Throw an error and prevent compilation if there're unknown structures detected by DNA 2012-05-04 08:18:47 +00:00
Campbell Barton
112162e09e code cleanup: header cleanup 2012-04-30 14:24:11 +00:00
Campbell Barton
343edf2722 style cleanup: function calls & whitespace. 2012-04-29 17:11:40 +00:00
Campbell Barton
e701f9b670 style cleanup: whitespace / commas 2012-04-29 15:47:02 +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
b340f930ec style cleanup: changes to brace placement / newlines - for/while/if/switch 2012-04-28 06:31:57 +00:00
Antony Riakiotakis
4782522379 Add libMV and Scons support for MinGW-w64, patches by Caleb Joseph with slight modifications. 
Thanks!
 2012-04-24 12:57:58 +00:00
Campbell Barton
b56aabf815 style cleanup: multi-line if statements. 2012-04-21 15:11:03 +00:00
Campbell Barton
6701933f5c style cleanup 2012-04-21 12:51:47 +00:00
Tamito Kajiyama
4a19ccfa5f Merged changes in the trunk up to revision 45619. 2012-04-14 10:38:11 +00:00
Campbell Barton
c74ace03e0 fix [#30907] Inset tool with Select Outer disabled does not allow translation of new faces 
inset with select-inner faces gave invalid selection.

also correct spelling in some comments.
 2012-04-12 07:40:47 +00:00
Tamito Kajiyama
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
Campbell Barton
5b88712ff9 move debug flag into its own global var (G.debug), split up debug options. 
--debug
  --debug-ffmpeg
  --debug-python
  --debug-events
  --debug-wm

This makes debug output easier to read - event debug prints would flood output too much before.

For convenience:
  --debug-all turns all debug flags on (works as --debug did before).

also removed some redundant whitespace in debug prints and prefix some prints with __func__ to give some context.
 2012-03-31 00:59:17 +00:00
Tamito Kajiyama
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
Campbell Barton
5a90ea77bc style cleanup: follow style guide for formatting of if/for/while loops, and else if's 2012-03-24 06:24:53 +00:00
Tamito Kajiyama
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
Campbell Barton
89a963fb7f style cleanup: comment blocks 2012-03-09 18:28:30 +00:00
Campbell Barton
0c05194639 remove printing versions in makesdna/makesrna - this used svn ID property which isnt set in the files anymore. 2012-03-07 18:27:12 +00:00
Campbell Barton
31d2ee9bf7 style cleanup, brackets in else/if, some indentation. 2012-03-06 18:40:15 +00:00
Campbell Barton
529b2a01eb added check for DNA C syntax we cant parse: 
void*somepointer;

.. this is valid C but breaks makesdna.c
 2012-03-05 16:21:13 +00:00
Campbell Barton
f6ae27daef style cleanup - comment spelling + translate some dutch. 2012-03-04 04:35:12 +00:00
Tamito Kajiyama
9e93fc1e8a Merged changes in the trunk up to revision 44612. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh.h
 2012-03-03 01:43:44 +00:00
Campbell Barton
ea13ec1699 Spelling Cleanup 2012-03-01 12:20:18 +00:00
Tamito Kajiyama
69289c978e Merged changes in the trunk up to revision 44266 (including BMesh). 
Freestyle edge/face marks were ported to BMesh.

Conflicts resolved:
source/blender/editors/mesh/editface.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/blenkernel/intern/editderivedmesh.c
 2012-02-21 01:40:04 +00:00
Tamito Kajiyama
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
Campbell Barton
2cd5436a81 svn merge ^/trunk/blender -r42839:42871 2011-12-25 21:31:19 +00:00
Campbell Barton
eb3beca8d4 replace u_int64_t with cc99's uint64_t as suggested by Nicholas Bishop. 2011-12-24 03:03:42 +00:00
Campbell Barton
ddcf56366d change customdata mask from an 'unsigned int' to an 'u_int64_t', since BMesh branch has run out of bits 2011-12-23 20:30:23 +00:00
Campbell Barton
4ced91da47 svn merge ^/trunk/blender -r42778:42839 2011-12-23 08:41:53 +00:00
Campbell Barton
27b47892a0 add DNA support for int64_t. nothing uses this currently. 2011-12-23 04:40:07 +00:00