griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
40,886 Commits 1 Branch 0 Tags
d6ec4b874b99f096ce2aa1c2864609bb2e4b58ad
Commit Graph

40886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brecht Van Lommel
d6ec4b874b Compositor: initialize OpenCL only when the option is enabled. This eliminates 
error prints or even crashes for poor OpenCL implementations when not using it.
 2012-09-03 12:52:21 +00:00
Thomas Dinges
9fbc1c3149 * Added back UI switch for the Cycles shading system. Only visible when the feature set is "Experimental". 2012-09-03 12:35:32 +00:00
Sergey Sharybin
dde5ccb61f Fix for logging FFmpeg messages 2012-09-03 12:01:00 +00:00
Brecht Van Lommel
1cb9b1ddf3 Fix #32461: adjusting brush strength with shift+F in image editor would show 
the cursor too big when zoomed in. Only the size adjusment needs to follow the
zoom level of the editor, others are fixed size.
 2012-09-03 11:55:30 +00:00
Lukas Toenne
2f70800923 Fix for OSL shader install paths. 2012-09-03 11:38:22 +00:00
Lukas Toenne
99972cbfdc RTTI needs to be disabled in cycles for OSL. 2012-09-03 11:38:20 +00:00
Lukas Toenne
c0a3657e7a Added library linking for cycles_kernel_osl to OSL libraries and added cycles_kernel_osl to the list of blender libs in creator. 2012-09-03 11:38:18 +00:00
Lukas Toenne
0238d032b2 Replaced dynamic_casts for node type checks by simple 'special type' identifiers. RTTI has to be disabled in cycles for OSL. 2012-09-03 11:38:15 +00:00
Brecht Van Lommel
acebddeb23 Fix #32468: 3d view texture paint mode did not show uv layout in image editor. 2012-09-03 11:26:04 +00:00
Campbell Barton
737f2e8be8 fix [#31694] Circle Selection is ignored within face selection in texture paint mode 2012-09-03 10:39:15 +00:00
Campbell Barton
95f7264014 code cleanup: split out defines in BKE_utildefines.h into BLO_blend_defs.h and ui defines in interface_intern.h 2012-09-03 10:12:25 +00:00
Campbell Barton
b8b5bf7dcd array functions for endian switching. 2012-09-03 09:03:25 +00:00
Campbell Barton
d248f94cf8 add endian switch functions to replace macros SWITCH_INT/LONG/SHORT, with BLI_endian_switch_int32/int64/float/double... 2012-09-03 07:37:38 +00:00
Campbell Barton
ca6fa937d4 style cleanup 2012-09-03 05:36:47 +00:00
Campbell Barton
56534ecdcb style cleanup: also add debugging print function for derived mesh DM_debug_print_cdlayers() 2012-09-03 02:41:12 +00:00
Campbell Barton
721c37072e uncomment data identifiers from sphinx docs (own error made r41509) 2012-09-03 02:08:56 +00:00
Campbell Barton
892cfa4285 fix [#32434] Copy-Paste Tracks causes Blender to freeze/crash on second use. 2012-09-03 01:05:04 +00:00
Campbell Barton
bd53226b5c fix [#32423] Extrude crash 
mistake in r50086 caused the crash (killing the wrong vertex)
 2012-09-03 00:30:55 +00:00
Campbell Barton
dbdd1bb4f2 remove vertex groups from a mesh or lattice when this there are no remaining vertex groups. This was dont in edit-mode but not object-mode. 2012-09-03 00:02:13 +00:00
Lukas Toenne
c9cd150f43 Cycles compile fix: only use std::isfinite when OSL is enabled. 2012-09-02 18:11:28 +00:00
Thomas Dinges
dfec5a3655 * Removed last occurrence of get_pointcloud_attr_query. 2012-09-02 17:39:07 +00:00
Thomas Dinges
add7ca12d9 * OSL can't overwrite input parameters, use a local variable instead. 2012-09-02 16:37:58 +00:00
Thomas Dinges
b26d19a7b8 Cycles / OSL: 
* Updates for noise_turbulence, to match svm function.
 2012-09-02 16:06:18 +00:00
Lukas Toenne
e1bca6cfc4 Fixed a number of OSL syntax errors from the updated 1.2 API. Microfacet functions now all take an eta parameter, set to 1.0 if no IOR is given. 2012-09-02 15:41:35 +00:00
Thomas Dinges
28d02bc056 Fix for r50314: 
* oren_nayar is not part of the default stdosl, added it back.
 2012-09-02 15:26:13 +00:00
Lukas Toenne
092f6344c3 Fixed remaining syntax errors in OSL files. node_sepcomb_rgb.osl is split into 2 parts, since OSL only allows one shader per file. 2012-09-02 15:07:51 +00:00
Sv. Lockal
ebbfc46bea Use function pointers instead of hard-coded english button names in color picker block. 
This solves the problem with es/ru translations of color picker block reported by Gabriel Gazzán in Bf-translations-dev.
 2012-09-02 13:36:33 +00:00
Thomas Dinges
f1d279912f Cycles / OSL: 
* Add oslutil.h, from osl 1.2.
 2012-09-02 13:34:12 +00:00
Thomas Dinges
6c02a8fc8c OSL / Cycles: 
* Update the stdosl header file, from official osl 1.2.
 2012-09-02 13:23:44 +00:00
Thomas Dinges
25fc454ce0 Cycles / OSL: 
* Remove declaration of node_blend_weight_texture from cmake, does not exist, and match node_blend_weight name in nodes.cpp with the actual file.
 2012-09-02 12:46:54 +00:00
Thomas Dinges
23dca13691 Cycles / OSL: 
* First batch of compile fixes for several shaders, mainly syntax errors.
 2012-09-02 12:24:04 +00:00
Thomas Dinges
748582f49e Cycles / OSL: 
Fixes for API changes in OSL RendererServices:

* Added two new required get_matrix methods, from OSL RendererServices (otherwise the constructor fails). The two new matrix methods probably still need an implementation. 
* Removed deprecated "get_pointcloud_attr_query" and "pointcloud". There are two new routines for pointclouds, function headers for those are there.

* Removed the (unused) PARTIO code parts from OSL. It was marked as not tested / not working, and due to the api changes here broken for sure. Code is still in svn history if needed.
 2012-09-02 01:10:31 +00:00
Benoit Bolsee
53f343edd7 ..\commmit_hive.txt 2012-09-01 21:23:05 +00:00
Thomas Dinges
779ecb06dd Cycles / OSL: 
* Compile fix for the "direction_to_panorama" issue.
Added kernel_projection.h to kernel_triangle.h.
 2012-09-01 15:30:35 +00:00
Antony Riakiotakis
bcb552ef94 Enable shader model 3.0 shaders for mingw compilers 2012-09-01 14:53:01 +00:00
Lukas Toenne
ff9b071fbd Fix #32463, Cycles crashing. The particle system sync_recalc part was checking object data, which can be NULL and doesn't actually say anything about particles, removed. 2012-09-01 11:30:22 +00:00
Lukas Toenne
cc835e47b0 Cycles fix: don't skip particle device update when there are no particle systems. The device texture always contains at least one dummy particle in case particle info node is used for non-instance objects, this must be initialized in any case. 2012-09-01 11:30:19 +00:00
Thomas Dinges
fda711a851 Cycles / OSLGlobals: 
* Fixes for changes in the Open Shading Langauge API from version 0.6.0: 11ce51418b

* Removed the need for ShadingSystemImpl.
 2012-08-31 20:31:21 +00:00
Thomas Dinges
7ac0dd2953 Cycles / OSL: 
* OSL namespace fixes for osl_shader.cpp.
 2012-08-31 20:08:55 +00:00
Thomas Dinges
01815d83fb Cycles / OSL: 
* Fixes for changes in r40163. Removed unused code and fixed emissive_eval function.
 2012-08-31 19:59:50 +00:00
Thomas Dinges
99abcb8e45 Possible fix for [#32462] blender cannot load bmp files (Windows OS). 
* Typo in the CHECK_HEADER_FIELD macro. 

Patch by kjym3 in IRC, thanks!
 2012-08-31 19:57:03 +00:00
Lukas Toenne
2694b68d4a Cycles: Fix for particle info node crash: The particle 'alive' state can be set to 'dying', which is just an indicator that the particle will be removed, but it is is used for instancing. This would lead to insufficient texture size and assert crash. 2012-08-31 19:39:08 +00:00
Lukas Toenne
3ca3102bcf Cycles: Fully initialize the dummy particle at index 0. 2012-08-31 19:39:06 +00:00
Lukas Toenne
1228be0896 Cycles: Start the particle index for object instances at 1 instead 0. The first particle in the device texture is a dummy for non-instance objects using the particle info node. 2012-08-31 19:39:04 +00:00
Lukas Toenne
cabdeec0c0 Cycles: Tag particle systems after syncing to make sure the particle system manager updates the device data. 2012-08-31 19:39:03 +00:00
Lukas Toenne
9e3fa15d4b Added a bunch of additional particle state attributes to the Cycles particle info node: 
* Location: Basically the same as the location from Object Info node for object instances on particles, but in principle there could be additional offsets for dupli objects, so included for completeness.
* Size: Single float scale of the particle. Also directly translates to object scale for current dupli objects, but handy to have as a single float to start with instead of a scale vector (currently not even exposed in Object Info).
* Rotation: This is a quaternion, which are not yet supported by Cycles nodes. The float4 is copied to internal Cycles data and stored in the particles texture data, but the node doesn't have a socket for it yet and the data is not yet written to the stack. Code is just commented out so could be enabled quickly if/when rotation support is added to cycles.
* Velocity: Linear velocity vector of particles.
* Angular Velocity: Angular velocity around principle axes.

The texture data is currently packed tightly into the particles texture, which saves a few bytes, but requires an additional texture lookup for some vector attributes which spread over two float4s. Could also add another float4 to particle size to avoid this.
 2012-08-31 19:38:59 +00:00
Lukas Toenne
f0d2477484 Fix for #32184 and redesign of particle storage in Cycles. 
The particle data used by the Particle Info node was stored in cycles as a list in each object. This is a problem when the particle emitter mesh is hidden: Objects in cycles are only intended as instances of renderable meshes, so when hiding the emitter mesh the particle data doesn't get stored either. Also the particle data can potentially be copied to multiple instances of the same object, which is a waste of texture space.

The solution in this patch is to make a completely separate list of particle systems in the Cycles scene data. This way the particle data can be generated even when the emitter object itself is not visible.
 2012-08-31 17:27:08 +00:00
Brecht Van Lommel
5ecff7a240 Fix #32329: inset produces incorrect result, epsilon was too small to handle 
floating point error.
 2012-08-31 16:10:13 +00:00
Brecht Van Lommel
fe9b1c644f Fix #32458: changing UV image in image editor not working when the active face 
was not selected. Now changed it so that the active face must also have its
UVs shown in the image editor to be used as the source of the image shown.
 2012-08-31 15:01:40 +00:00
Brecht Van Lommel
78c181fafc Fix part of #32376: mirror vertex groups with flip group names did not keep 
the same vertex group active.
 2012-08-31 13:43:56 +00:00