griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
37,129 Commits 1 Branch 0 Tags
001b8af4ffa01ac0ccfb1c4d7e392bbc2219cf7d
Commit Graph

1150 Commits

Author SHA1 Message Date
Tamito Kajiyama
001b8af4ff Merged changes in the trunk up to revision 44436. 2012-02-25 21:11:29 +00:00
Campbell Barton
3fc2fbc333 style cleanup, use { on newline after function definition. 
spelling 'impliment' -> 'implement'
 2012-02-25 16:49:59 +00:00
Tamito Kajiyama
9ca7f6659f Merged changes in the trunk up to revision 44419. 
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/creator/CMakeLists.txt
 2012-02-25 01:26:45 +00:00
Campbell Barton
b9b0c3dfb4 bmesh python api - add/improve rst docstrings. 2012-02-24 04:59:13 +00:00
Campbell Barton
38f546a614 swap arg order for BM_edge_split(), makes sense to have edge as first 
arg.
 2012-02-23 05:17:07 +00:00
Campbell Barton
e0a6d273d0 bmesh py api - generalize bmesg sequences to use the iterator type and optionally another bmesh element. 
This allows BMFace.verts to be added without defining a new sequence type.
 2012-02-22 10:41:07 +00:00
Campbell Barton
e7d98179ea initial bmesh python api. 
corrently allows to create and loop over verts/edges/faces, access selection and selection modes.

this is still WIP, access to face, edge verts is still missing, no access to UV's, no access to editing operations yet.

When the api is ready it will be documented by sphinx like mathutils, blf, aud.
 2012-02-22 09:19:53 +00:00
Campbell Barton
1f40f01435 correct exception - was using a TypeError when should be a ValueError. 2012-02-22 09:13:29 +00:00
Tamito Kajiyama
9f243d531c Merged changes in the trunk up to revision 44288. 
Conflicts resolved:
source/blender/blenkernel/intern/cdderivedmesh.c
 2012-02-21 02:19:54 +00:00
Campbell Barton
c4e7cc3287 fix for leak in gpu.export_shader(), wasnt freeing the function. 
also change the bmesh iterator so its possible to initialize without stepping.
 2012-02-20 22:04:29 +00:00
Tamito Kajiyama
910f04ca63 Merged changes in the trunk up to revision 44221. 
Conflicts resolved:
release/datafiles/blender_icons.png
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenloader/intern/readfile.c
 2012-02-18 11:26:11 +00:00
Campbell Barton
61596d5bb3 patch [#30227] Various MSVC (32-bit) Warning and Typo Fixes 
made some small edits
- removed changes to AVI reading since the data types are apart of the format spec.
- absf -> abs for a double value in render code.
 2012-02-17 19:21:47 +00:00
Campbell Barton
2b7ca2304a unify include guard defines, __$FILENAME__ 
without the underscores these clogged up the namespace for autocompleation which was annoying.
 2012-02-17 18:59:41 +00:00
Tamito Kajiyama
5c5685f6c5 Merged changes in the trunk up to revision 44039. 2012-02-12 00:09:48 +00:00
Campbell Barton
4acab3eb33 Code Cleanup: line length and use Py_ssize_t for PyC_AsArray utility function. 2012-02-05 02:04:26 +00:00
Tamito Kajiyama
8160829303 Merged changes in the trunk up to revision 43881. 2012-02-04 14:22:05 +00:00
Campbell Barton
697e77a494 fix [#29666] Duplicate entries in bpy.types 
Python operator subclasses and operator types each get their own SRNA, causing double ups for bpy.types.__dir__()

From the operator type - these share names.
* ot->ext.srna
* ot->srna

Note that this conflict is still there, this only disables 'ot->ext.srna' from being included in dir(bpy.types).
 2012-02-02 04:43:35 +00:00
Tamito Kajiyama
68ae82bb47 Merged changes in the trunk up to revision 43585. 
Conflicts resolved:
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
 2012-01-21 23:01:25 +00:00
Campbell Barton
c5d7f8e416 formatting edits (<120 line length), remove invalid 'defaults' keyword arg from docs. 2012-01-21 10:27:24 +00:00
Campbell Barton
57ad3b85d8 fix [#27589] Random crash with python UI 
This script was defining an operator within the panels draw function, while its possible to support this its really asking for trouble.

the fix is to raise an error when this happens.

also fix crash passing non classes to register_class/unregister_class
 2012-01-18 19:50:44 +00:00
Campbell Barton
af6f753400 fix for segfault with bpy compiled as python module (dont register atexit) 
update `make lite` built target to remove some newly added features.
 2012-01-17 15:19:11 +00:00
Tamito Kajiyama
e0df491d1e Merged changes in the trunk up to revision 43404. 
Conflicts resolved:
source/blender/python/SConscript
 2012-01-15 23:13:12 +00:00
Campbell Barton
8c9c018c90 note on compating RNA pointers and compare RNA types for RNA-Properties too. 2012-01-15 12:35:40 +00:00
Campbell Barton
0f34ce27cf fix for error comparing py-struct members 
if 2 pyrna structs used the same pointer they could incorrectly compare as true, this caused an error in theme saving because an item could match its parent and stop writing (to prevent recursive writing of same data).

eg:
  context.user_preferences.themes[0].user_interface.wcol_regular == context.user_preferences.themes[0].user_interface
 2012-01-13 11:36:32 +00:00
Campbell Barton
309f3f31e7 remove redundant trailing slashes 2012-01-12 06:11:08 +00:00
Campbell Barton
02560d748f add RNA_property_is_set function, use for WM_menu_invoke to avoid double lookup and py api to de-duplicate some checks 2012-01-11 16:48:22 +00:00
Campbell Barton
f66f33cefc rename RNA_property_is_set() --> RNA_struct_property_is_set() in preperation to add a second version of the function which takes the property rather then its name. 2012-01-11 16:32:12 +00:00
Brecht Van Lommel
d7932ceea8 Cycles: multi GPU rendering support. 
The rendering device is now set in User Preferences > System, where you can
choose between OpenCL/CUDA and devices. Per scene you can then still choose
to use CPU or GPU rendering.

Load balancing still needs to be improved, now it just splits the entire
render in two, that will be done in a separate commit.
 2012-01-09 16:58:01 +00:00
Tamito Kajiyama
76a211d809 Merged changes in the trunk up to revision 43219. 
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/pipeline.c
 2012-01-08 11:57:53 +00:00
Campbell Barton
e039a631a9 add bpy collection method .find(key), so you can get the index of an item in a collection, -1 if not found. 
use this to replace bge text ui py function.
 2012-01-05 06:05:45 +00:00
Tamito Kajiyama
cc3adc2202 Merged changes in the trunk up to revision 43038. 
Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c
 2011-12-31 21:09:26 +00:00
Campbell Barton
4f0b7e8c6a py - fix for error which made enums not through errors when assigned non string types 2011-12-29 14:46:26 +00:00
Campbell Barton
85a97f64a7 add UNLIKELY / LIKELY util defines to help optimize iterators that are called a lot, only defined for gcc at the moment. 
also some cmake formatting edits.
 2011-12-29 01:46:58 +00:00
Campbell Barton
5b88e16306 WIP loading bmesh in trunk, some conversion functions for this purpose. 2011-12-28 13:50:33 +00:00
Sergey Sharybin
c5a81536ca Add FFmpeg libraries versions to system-info.txt 2011-12-28 12:35:58 +00:00
Campbell Barton
6d878810c6 for bpy.props, when 'name' argument is not initialized, vallback to the attribute name rather than an empty string. 2011-12-28 04:25:46 +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
e17fd46c71 formatting edits only to use more consisted style 2011-12-26 12:26:11 +00:00
Campbell Barton
33bd38ebc7 minor edits to cycles c/python module 
- rename 'bcycles' --> '_cycles', since this is the python convention when a py module uses a C module internally.
- use macros for returning None
- make with_osl an attribute rather then a function.
- changes methods METH_VARARGS --> METH_O when single args are used.
 2011-12-24 02:47:13 +00:00
Campbell Barton
c9f1ca961a fix for matrix assignment with recent changes which broke for eg: 
ob.matrix_world = matrix
 2011-12-22 08:44:08 +00:00
Campbell Barton
96bd647c4f split some >120 lines, no functional changes 2011-12-21 22:56:06 +00:00
Campbell Barton
a8ed803b66 rename internal matrix struct member vars to avoid confusion 
Matrix.contigPtr --> matrix
Matrix.row_size --> num_col
Matrix.col_size --> num_row
 2011-12-20 04:11:23 +00:00
Campbell Barton
9c9099a805 formatting edits in py api, no functional changes 2011-12-18 08:50:06 +00:00
Tamito Kajiyama
4a92ee2831 Merged changes in the trunk up to revision 42692. 2011-12-17 21:24:39 +00:00
Campbell Barton
cad9cb563d fix own error [#29631] frame is lost from driver namespace after reload 2011-12-16 03:06:56 +00:00
Campbell Barton
dbebf4ff53 fix [#29635] Attempts to import the site module are met with a TypeError exception. 2011-12-16 00:06:01 +00:00
Tamito Kajiyama
efc4341ee4 Merged changes in the trunk up to revision 42556. 
Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
 2011-12-10 20:54:43 +00:00
Morten Mikkelsen
965c287630 fixes scale on derivative maps 2011-12-09 23:26:06 +00:00
Campbell Barton
6f7ae034fd fix for noise module in driver namespace (was infact mathutils). 2011-12-07 00:36:57 +00:00
Tamito Kajiyama
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