0b7593a3dc
finish cleanup for plugins
2012-05-29 10:31:42 +00:00
16117143d8
Massive Code cleanup:
...
* Remove all code for Texture and Sequencer plugin system, this never worked in 2.5x / 2.6x and is therefore not needed anymore.
* DNA structures are kept, all read/writefile code is gone.
2012-05-29 10:21:07 +00:00
0c7fa76e59
remove some more pynode references in the code
2012-05-29 09:42:11 +00:00
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
04bc89a8b6
code cleanup: remove some old comments
2012-05-21 09:00:35 +00:00
ed679693c9
style cleanup: whitespace/indentation
2012-05-19 13:55:54 +00:00
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
68e27b749e
fix for building without libmv
2012-05-12 09:40:23 +00:00
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
1c0c2f4d0b
Added verbosity command line argument. Currently used for libmv only.
...
Usage: ./blender --verbose <level>
Also fixed some crashes when not passing number to --threads argument
or not passing file format to -F argument.
2012-05-11 17:33:48 +00:00
34b18fcbc1
code cleanup: BKE_ naming, also make bpy.data.images.load() always load a new image. (not use existing one)
2012-05-05 14:52:04 +00:00
299ff91ea1
code cleanup: BKE_scene api naming.
...
also stop numpy from being found in /usr/include with cmake.
2012-05-05 14:33:36 +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
5c5349e086
Fix: --debug-python command option was not working correct.
2012-05-02 14:23:00 +00:00
6327c9aae1
style cleanup: whitespace, braces
2012-05-01 20:08:23 +00:00
cdbfd1db38
Merged changes in the trunk up to revision 45820.
...
Conflicts resolved:
source/creator/creator.c
2012-04-21 00:33:36 +00:00
0635f8101c
make scanfill threadsafe (wasnt threadsafe before BMesh merge but before the merge it didn't need to be) - now rendering uses its better if its threadsafe.
2012-04-16 06:48:57 +00:00
a73d0d3e72
code cleanup: dont include BLI_winstuff.h on non windows systems, also cleanup some defines/includes for windows.
2012-04-15 07:54:07 +00:00
513f363ea0
Silencing some compiler warnings on Windows
...
argv is defined as "char *" here so that unicode magic can happen causing
problems later on when "const char**" is expected instead. While this fix is
redundant on other platforms, it's a lot less confusing than some of the
alternative fixes.
2012-04-14 11:58:52 +00:00
4a19ccfa5f
Merged changes in the trunk up to revision 45619.
2012-04-14 10:38:11 +00:00
cc1259178b
code cleanup: utfconv library had some quite confusing formatting, also cleared som warnings.
2012-04-12 02:15:33 +00:00
fd37970b80
* Replace some more Blender 2.5x with Blender 2.6x and some code cleanup.
2012-04-07 18:39:29 +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
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
785373b03a
Added new command-line arguments --debug-ffmpeg and --debug-libmv to
...
be able to see debug prints coming from FFmpeg or libmv independently
of general blender debug messages.
2012-03-30 10:37:49 +00:00
711d7539e0
style cleanup: for creator.c & more useful assert message (file:line)
2012-03-28 05:09:50 +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
b8a71efeba
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
ab4a2aaf4a
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
f11a6d3a84
Adds support for utf paths on Windows.
...
Not all file formats/calls are supported yet. It will be expended.
Please from now on use BLI_fopen, BLI_* for file manipulations.
For non-windows systems BLI_fopen just calls fopen.
For Windows, the utf-8 string is translated to utf-16 string in order to call UTF version of the function.
2012-03-20 02:17:37 +00:00
4f19c1a995
spelling cleanup
2012-03-18 07:38:51 +00:00
0c50bedd9c
code cleanup: remove unused externs.
2012-03-11 00:00:27 +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
89a963fb7f
style cleanup: comment blocks
2012-03-09 18:28:30 +00:00
79d97ca509
style cleanup - spelling.
2012-03-08 04:12:11 +00:00
46045fbb09
style cleanup - braces & else / if's
2012-03-07 04:53:43 +00:00
31d2ee9bf7
style cleanup, brackets in else/if, some indentation.
2012-03-06 18:40:15 +00:00
9d49fa0e63
style cleanup - spelling corrections & update some incorrect comments.
2012-03-03 11:45:08 +00:00
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
02b28e9162
replace MIN2 / MAX2 with minf / maxf to avoid calling functions multiple times.
2012-02-19 05:11:24 +00:00
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
3b12a4b92b
Fix for standalone bpy module building link errors on Mac.
...
It seems to be working now, however make sure to build against the exact same
python version as the one you will use it with, the version in the lib/darwin*
directory is likely to differ from python installed on your system.
2012-01-16 14:13:41 +00:00
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
7f555daa64
print message for unknown args to make it clear that these are not recognized.
2012-01-05 11:02:27 +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
986e62f3b6
fix for a bug in mathutils when a vector was accessing a matrix and the matrix size increased, future access too the vector would write past the allocated bounds. now raise an exception.
2011-12-26 00:05:41 +00:00
b6569ee4e7
Merged changes in the trunk up to revision 42116.
2011-11-26 13:11:55 +00:00
6736576f6d
replace FILE_MAXDIR + FILE_MAXFILE with FILE_MAX
2011-11-26 04:07:38 +00:00
df22957bfc
image format arg parsing for creator.c
...
move these checks from creator into BKE's image.c, this way we dont need the defines for creator, scons was missing DDS, HDR & Cineon for example and nobody noticed.
2011-11-24 05:18:26 +00:00
